From 34962e98e3b23bd33da7e23b83efbb9b0f87a2bf Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Wed, 30 Sep 2015 22:02:21 +0200 Subject: [PATCH] [windows] don't call tesh as a script as cmake fails to preserve the exec permission on this file --- tools/tesh/IO-orders.tesh | 12 ++++++------ tools/tesh/basic.tesh | 18 +++++++++--------- tools/tesh/catch-return.tesh | 2 +- tools/tesh/catch-signal.tesh | 2 +- tools/tesh/catch-timeout.tesh | 2 +- tools/tesh/catch-wrong-output.tesh | 2 +- tools/tesh/cd.tesh | 2 +- tools/tesh/set-output-ignore.tesh | 2 +- tools/tesh/set-output-sort.tesh | 6 +++--- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tools/tesh/IO-orders.tesh b/tools/tesh/IO-orders.tesh index e2c0a25d71..7453ff88c8 100644 --- a/tools/tesh/IO-orders.tesh +++ b/tools/tesh/IO-orders.tesh @@ -8,7 +8,7 @@ p Order: in, out, cmd > Test suite from stdin > [(stdin):3] cat > Test suite from stdin OK -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh p Order: out, in, cmd < > TOTO @@ -17,7 +17,7 @@ p Order: out, in, cmd > Test suite from stdin > [(stdin):3] cat > Test suite from stdin OK -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh p Order: out, cmd, in < > TOTO @@ -26,7 +26,7 @@ p Order: out, cmd, in > Test suite from stdin > [(stdin):2] cat > Test suite from stdin OK -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh p Order: in, cmd, out < < TOTO @@ -35,7 +35,7 @@ p Order: in, cmd, out > Test suite from stdin > [(stdin):2] cat > Test suite from stdin OK -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh p Order: cmd, out, in < $ cat @@ -44,7 +44,7 @@ p Order: cmd, out, in > Test suite from stdin > [(stdin):1] cat > Test suite from stdin OK -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh p Order: cmd, in, out < $ cat @@ -53,4 +53,4 @@ p Order: cmd, in, out > Test suite from stdin > [(stdin):1] cat > Test suite from stdin OK -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh diff --git a/tools/tesh/basic.tesh b/tools/tesh/basic.tesh index db3d8f7e1e..7f3d8c6672 100644 --- a/tools/tesh/basic.tesh +++ b/tools/tesh/basic.tesh @@ -13,7 +13,7 @@ $ cat tmp_fich ! output ignore < $ cat tmp_fich < > TUTU TOTO -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh $ rm tmp_fich @@ -77,14 +77,14 @@ $ sed 's/_/ /' < < _x < $ sed 's/_/ /' < > x -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh ! expect return 2 ! output ignore < < x < $ cat < > x -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh p * trailing spaces... < x_ @@ -96,14 +96,14 @@ $ sed 's/_/ /' < < x_ < $ sed 's/_/ /' < > x -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh ! expect return 2 ! output ignore < < x < $ cat < > x -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh p * empty lines... < a @@ -122,7 +122,7 @@ $ cat < $ cat < > a < > c -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh ! expect return 2 ! output ignore @@ -132,7 +132,7 @@ $ ${bindir:=.}/tesh < > a < > < > c -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh < < b @@ -150,7 +150,7 @@ $ cat < $ cat < > b < > c -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh ! expect return 2 ! output ignore @@ -160,4 +160,4 @@ $ ${bindir:=.}/tesh < > < > b < > c -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh diff --git a/tools/tesh/catch-return.tesh b/tools/tesh/catch-return.tesh index f14d15bc16..3a96bf0fd1 100644 --- a/tools/tesh/catch-return.tesh +++ b/tools/tesh/catch-return.tesh @@ -4,7 +4,7 @@ ! expect return 41 < $ perl -e "exit 1" -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh > Test suite from stdin > [(stdin):1] perl -e "exit 1" > Test suite `(stdin)': NOK (<(stdin):1> returned code 1) diff --git a/tools/tesh/catch-signal.tesh b/tools/tesh/catch-signal.tesh index 552c580445..1d47102460 100644 --- a/tools/tesh/catch-signal.tesh +++ b/tools/tesh/catch-signal.tesh @@ -16,7 +16,7 @@ $ perl segfault.pl p Check that we return the expected return value on SEGV ! expect return 15 < $ perl segfault.pl -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh > Test suite from stdin > [(stdin):1] perl segfault.pl > Test suite `(stdin)': NOK (<(stdin):1> got signal SIGSEGV) diff --git a/tools/tesh/catch-timeout.tesh b/tools/tesh/catch-timeout.tesh index 305997eb2d..d6ac0a3839 100644 --- a/tools/tesh/catch-timeout.tesh +++ b/tools/tesh/catch-timeout.tesh @@ -11,4 +11,4 @@ > <(stdin):2> timeouted. Kill the process. > Test suite `(stdin)': NOK (<(stdin):2> timeout after 1 sec) > <(stdin):2> No output so far. -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh diff --git a/tools/tesh/catch-wrong-output.tesh b/tools/tesh/catch-wrong-output.tesh index 6273a9b828..1dcd26d6dd 100644 --- a/tools/tesh/catch-wrong-output.tesh +++ b/tools/tesh/catch-wrong-output.tesh @@ -6,7 +6,7 @@ p This tests whether TESH detects wrong outputs < > TOTO < < TUTU < $ cat -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh > Test suite from stdin > [(stdin):3] cat > Output of <(stdin):3> mismatch: diff --git a/tools/tesh/cd.tesh b/tools/tesh/cd.tesh index 6a9ce2dacd..a12be7c5e0 100644 --- a/tools/tesh/cd.tesh +++ b/tools/tesh/cd.tesh @@ -15,7 +15,7 @@ $ ls > Test suite from stdin > Chdir to toto failed: No such file or directory > Test suite `(stdin)': NOK (system error) -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh # The next command checks that there is a testdir_temp-cd in the upper directory, # ie that mkdir and cd both worked. diff --git a/tools/tesh/set-output-ignore.tesh b/tools/tesh/set-output-ignore.tesh index 04da086a7a..120b620c5e 100644 --- a/tools/tesh/set-output-ignore.tesh +++ b/tools/tesh/set-output-ignore.tesh @@ -6,7 +6,7 @@ p This tests whether TESH accepts to ignore command output < > TOTO < < TUTU < $ cat -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh > Test suite from stdin > [(stdin):4] cat > (ignoring the output of <(stdin):4> as requested) diff --git a/tools/tesh/set-output-sort.tesh b/tools/tesh/set-output-sort.tesh index d5888ad142..f0abb75614 100644 --- a/tools/tesh/set-output-sort.tesh +++ b/tools/tesh/set-output-sort.tesh @@ -70,7 +70,7 @@ p This tests whether TESH correctly sorts command output < > b < > c < > d -$ ${bindir:=.}/tesh --enable-coverage +$ perl ${bindir:=.}/tesh --enable-coverage > Enable coverage > Test suite from stdin > [(stdin):1] Test sorting and filtering of output @@ -113,7 +113,7 @@ $ cat < $ cat < > 123456789012345678 A line < > 123456789012345678 B line -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh p Check user-defined prefix length for "output sort" ! output sort 5 @@ -138,4 +138,4 @@ $ cat < $ cat < > 000 A line < > 000 B line -$ ${bindir:=.}/tesh +$ perl ${bindir:=.}/tesh -- 2.20.1