Ticket #7333: 0001-mk-timeout-use-python2-when-possible.patch

File 0001-mk-timeout-use-python2-when-possible.patch, 1.2 KB (added by michalt, 8 months ago)

patch for testsuite

  • mk/boilerplate.mk 

    From 64108c844d19e3ddbad3eb4f18ce350658e35f0a Mon Sep 17 00:00:00 2001
From: Michal Terepeta <michal.terepeta@gmail.com>
Date: Sun, 14 Oct 2012 20:28:48 +0200
Subject: [PATCH] mk/timeout: use python2 when possible

---
 mk/boilerplate.mk  | 5 +++++
 timeout/calibrate  | 2 --
 timeout/timeout.py | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index 56b0284..a34e884 100644
    a b  
    125125GS = gs 
    126126CP = cp 
    127127RM = rm -f 
     128 
     129# Prefer "python2" 
    128130PYTHON = python 
     131ifeq "$(shell test -x $(which python2) && echo exists)" "exists" 
     132  PYTHON = python2 
     133endif 
    129134 
    130135# ----------------------------------------------------------------------------- 
    131136# configuration of TEST_HC 

  • timeout/calibrate 

    diff --git a/timeout/calibrate b/timeout/calibrate
index b0d75da..2867d00 100644
    a b  
    1 #!/usr/bin/env python 
    2  
    31import math 
    42import os 
    53from os import * 

  • timeout/timeout.py 

    diff --git a/timeout/timeout.py b/timeout/timeout.py
index 76660a7..2fba027 100644
    a b  
    1 #!/usr/bin/env python 
     1#!/usr/bin/env python2 
    22 
    33import errno 
    44import os