diff options
author | Michal Gorny <mgorny@gentoo.org> | 2018-12-22 10:51:53 +0000 |
---|---|---|
committer | Michal Gorny <mgorny@gentoo.org> | 2018-12-22 10:51:53 +0000 |
commit | a70184ba92b8bdbb27d16321a656353abf955b82 (patch) | |
tree | 036742278d487b154f09580cce5e0efa77e66bda /openmp | |
parent | da1df56e5dde64cfb8a148ebfaf3265a299e8f28 (diff) |
[runtime] [test] Fix using %python path
Fix the newly-added tests to use %python substitution in order to use
the correct path to Python interpreter. Otherwise, they fail on NetBSD
where there is no 'python', just 'pythonX.Y'.
Differential Revision: https://reviews.llvm.org/D56048
llvm-svn: 350001
Diffstat (limited to 'openmp')
-rw-r--r-- | openmp/runtime/test/affinity/format/affinity_display.1.c | 2 | ||||
-rw-r--r-- | openmp/runtime/test/affinity/format/api.c | 2 | ||||
-rw-r--r-- | openmp/runtime/test/affinity/format/api2.c | 2 | ||||
-rw-r--r-- | openmp/runtime/test/affinity/format/increase.c | 2 | ||||
-rw-r--r-- | openmp/runtime/test/affinity/format/nested.c | 2 | ||||
-rw-r--r-- | openmp/runtime/test/affinity/format/nested2.c | 2 | ||||
-rw-r--r-- | openmp/runtime/test/affinity/format/nested_mixed.c | 2 | ||||
-rw-r--r-- | openmp/runtime/test/affinity/format/nested_serial.c | 2 | ||||
-rw-r--r-- | openmp/runtime/test/affinity/format/proc_bind.c | 2 | ||||
-rw-r--r-- | openmp/runtime/test/affinity/format/simple.c | 12 | ||||
-rw-r--r-- | openmp/runtime/test/affinity/format/simple_env.c | 2 | ||||
-rw-r--r-- | openmp/runtime/test/lit.cfg | 1 |
12 files changed, 17 insertions, 16 deletions
diff --git a/openmp/runtime/test/affinity/format/affinity_display.1.c b/openmp/runtime/test/affinity/format/affinity_display.1.c index b900c3c919a5..fe357d3b3897 100644 --- a/openmp/runtime/test/affinity/format/affinity_display.1.c +++ b/openmp/runtime/test/affinity/format/affinity_display.1.c @@ -1,5 +1,5 @@ // RUN: %libomp-compile -// RUN: env OMP_DISPLAY_AFFINITY=TRUE OMP_NUM_THREADS=4 OMP_PLACES='{0,1},{2,3},{4,5},{6,7}' %libomp-run | python %S/check.py -c 'CHECK' %s +// RUN: env OMP_DISPLAY_AFFINITY=TRUE OMP_NUM_THREADS=4 OMP_PLACES='{0,1},{2,3},{4,5},{6,7}' %libomp-run | %python %S/check.py -c 'CHECK' %s // Affinity Display examples #include <stdio.h> diff --git a/openmp/runtime/test/affinity/format/api.c b/openmp/runtime/test/affinity/format/api.c index df6be668021e..08805e7a520b 100644 --- a/openmp/runtime/test/affinity/format/api.c +++ b/openmp/runtime/test/affinity/format/api.c @@ -1,5 +1,5 @@ // RUN: %libomp-compile-and-run -// RUN: %libomp-run | python %S/check.py -c 'CHECK' %s +// RUN: %libomp-run | %python %S/check.py -c 'CHECK' %s #include <stdio.h> #include <stdlib.h> diff --git a/openmp/runtime/test/affinity/format/api2.c b/openmp/runtime/test/affinity/format/api2.c index 7b2d70084a2e..c32da938f8d9 100644 --- a/openmp/runtime/test/affinity/format/api2.c +++ b/openmp/runtime/test/affinity/format/api2.c @@ -1,5 +1,5 @@ // RUN: %libomp-compile-and-run -// RUN: %libomp-run | python %S/check.py -c 'CHECK' %s +// RUN: %libomp-run | %python %S/check.py -c 'CHECK' %s #include <stdio.h> #include <stdlib.h> diff --git a/openmp/runtime/test/affinity/format/increase.c b/openmp/runtime/test/affinity/format/increase.c index 46d8edb353f8..b3942dbbc372 100644 --- a/openmp/runtime/test/affinity/format/increase.c +++ b/openmp/runtime/test/affinity/format/increase.c @@ -1,4 +1,4 @@ -// RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true %libomp-run | python %S/check.py -c 'CHECK' %s +// RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true %libomp-run | %python %S/check.py -c 'CHECK' %s #include <stdio.h> #include <stdlib.h> diff --git a/openmp/runtime/test/affinity/format/nested.c b/openmp/runtime/test/affinity/format/nested.c index 502c1dae8c97..2ecc918973b9 100644 --- a/openmp/runtime/test/affinity/format/nested.c +++ b/openmp/runtime/test/affinity/format/nested.c @@ -1,4 +1,4 @@ -// RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true OMP_PLACES=threads OMP_PROC_BIND=spread,close %libomp-run | python %S/check.py -c 'CHECK' %s +// RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true OMP_PLACES=threads OMP_PROC_BIND=spread,close %libomp-run | %python %S/check.py -c 'CHECK' %s // REQUIRES: affinity #include <stdio.h> diff --git a/openmp/runtime/test/affinity/format/nested2.c b/openmp/runtime/test/affinity/format/nested2.c index 3dd4956d4261..4b54912d29f6 100644 --- a/openmp/runtime/test/affinity/format/nested2.c +++ b/openmp/runtime/test/affinity/format/nested2.c @@ -1,4 +1,4 @@ -// RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true OMP_PLACES=threads OMP_PROC_BIND=spread,close KMP_HOT_TEAMS_MAX_LEVEL=2 %libomp-run | python %S/check.py -c 'CHECK' %s +// RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true OMP_PLACES=threads OMP_PROC_BIND=spread,close KMP_HOT_TEAMS_MAX_LEVEL=2 %libomp-run | %python %S/check.py -c 'CHECK' %s #include <stdio.h> #include <stdlib.h> diff --git a/openmp/runtime/test/affinity/format/nested_mixed.c b/openmp/runtime/test/affinity/format/nested_mixed.c index a39b4fdf4520..1e4c75372771 100644 --- a/openmp/runtime/test/affinity/format/nested_mixed.c +++ b/openmp/runtime/test/affinity/format/nested_mixed.c @@ -1,4 +1,4 @@ -// RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true %libomp-run | python %S/check.py -c 'CHECK' %s +// RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true %libomp-run | %python %S/check.py -c 'CHECK' %s #include <stdio.h> #include <stdlib.h> diff --git a/openmp/runtime/test/affinity/format/nested_serial.c b/openmp/runtime/test/affinity/format/nested_serial.c index 87ff2bd33611..8b84ba65ca15 100644 --- a/openmp/runtime/test/affinity/format/nested_serial.c +++ b/openmp/runtime/test/affinity/format/nested_serial.c @@ -1,4 +1,4 @@ -// RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true %libomp-run | python %S/check.py -c 'CHECK' %s +// RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true %libomp-run | %python %S/check.py -c 'CHECK' %s #include <stdio.h> #include <stdlib.h> diff --git a/openmp/runtime/test/affinity/format/proc_bind.c b/openmp/runtime/test/affinity/format/proc_bind.c index e88e1aaac82d..765c3ceaaf97 100644 --- a/openmp/runtime/test/affinity/format/proc_bind.c +++ b/openmp/runtime/test/affinity/format/proc_bind.c @@ -1,4 +1,4 @@ -// RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true OMP_PLACES='{0},{0,1},{0},{0,1},{0},{0,1},{0},{0,1},{0},{0,1},{0}' %libomp-run | python %S/check.py -c 'CHECK' %s +// RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true OMP_PLACES='{0},{0,1},{0},{0,1},{0},{0,1},{0},{0,1},{0},{0,1},{0}' %libomp-run | %python %S/check.py -c 'CHECK' %s // REQUIRES: affinity #include <stdio.h> diff --git a/openmp/runtime/test/affinity/format/simple.c b/openmp/runtime/test/affinity/format/simple.c index 954aa7477b1c..701c207200d0 100644 --- a/openmp/runtime/test/affinity/format/simple.c +++ b/openmp/runtime/test/affinity/format/simple.c @@ -1,10 +1,10 @@ // RUN: %libomp-compile -// RUN: env OMP_DISPLAY_AFFINITY=false %libomp-run | python %S/check.py -c 'NOTHING' %s -// RUN: env OMP_DISPLAY_AFFINITY=true OMP_NUM_THREADS=1 %libomp-run | python %S/check.py -c 'CHECK' %s -// RUN: env OMP_DISPLAY_AFFINITY=true OMP_NUM_THREADS=2 %libomp-run | python %S/check.py -c 'CHECK-2' %s -// RUN: env OMP_DISPLAY_AFFINITY=true OMP_NUM_THREADS=3 %libomp-run | python %S/check.py -c 'CHECK-3' %s -// RUN: env OMP_DISPLAY_AFFINITY=true OMP_NUM_THREADS=4 %libomp-run | python %S/check.py -c 'CHECK-4' %s -// RUN: env OMP_DISPLAY_AFFINITY=true OMP_NUM_THREADS=8 %libomp-run | python %S/check.py -c 'CHECK-8' %s +// RUN: env OMP_DISPLAY_AFFINITY=false %libomp-run | %python %S/check.py -c 'NOTHING' %s +// RUN: env OMP_DISPLAY_AFFINITY=true OMP_NUM_THREADS=1 %libomp-run | %python %S/check.py -c 'CHECK' %s +// RUN: env OMP_DISPLAY_AFFINITY=true OMP_NUM_THREADS=2 %libomp-run | %python %S/check.py -c 'CHECK-2' %s +// RUN: env OMP_DISPLAY_AFFINITY=true OMP_NUM_THREADS=3 %libomp-run | %python %S/check.py -c 'CHECK-3' %s +// RUN: env OMP_DISPLAY_AFFINITY=true OMP_NUM_THREADS=4 %libomp-run | %python %S/check.py -c 'CHECK-4' %s +// RUN: env OMP_DISPLAY_AFFINITY=true OMP_NUM_THREADS=8 %libomp-run | %python %S/check.py -c 'CHECK-8' %s #include <stdio.h> #include <stdlib.h> diff --git a/openmp/runtime/test/affinity/format/simple_env.c b/openmp/runtime/test/affinity/format/simple_env.c index 7aab1cfc04c8..ad0a2651e364 100644 --- a/openmp/runtime/test/affinity/format/simple_env.c +++ b/openmp/runtime/test/affinity/format/simple_env.c @@ -1,5 +1,5 @@ // RUN: %libomp-compile -// RUN: env OMP_DISPLAY_AFFINITY=true OMP_AFFINITY_FORMAT='TESTER-ENV: tl:%L tn:%n nt:%N' OMP_NUM_THREADS=8 %libomp-run | python %S/check.py -c 'CHECK-8' %s +// RUN: env OMP_DISPLAY_AFFINITY=true OMP_AFFINITY_FORMAT='TESTER-ENV: tl:%L tn:%n nt:%N' OMP_NUM_THREADS=8 %libomp-run | %python %S/check.py -c 'CHECK-8' %s #include <stdio.h> #include <stdlib.h> diff --git a/openmp/runtime/test/lit.cfg b/openmp/runtime/test/lit.cfg index 066929e5f429..02abba03d4f7 100644 --- a/openmp/runtime/test/lit.cfg +++ b/openmp/runtime/test/lit.cfg @@ -124,6 +124,7 @@ config.substitutions.append(("%clangXX", config.test_cxx_compiler)) config.substitutions.append(("%clang", config.test_c_compiler)) config.substitutions.append(("%openmp_flags", config.test_openmp_flags)) config.substitutions.append(("%flags", config.test_flags)) +config.substitutions.append(("%python", '"%s"' % (sys.executable))) if config.has_ompt: config.substitutions.append(("FileCheck", config.test_filecheck)) |