some changes for Windows (shell) compatibility and comment the sync call to test...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5408 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/tools/tesh2/examples/IO-bigsize.tesh b/tools/tesh2/examples/IO-bigsize.tesh
index 591c671..c923662 100644 (file)
--- a/tools/tesh2/examples/IO-bigsize.tesh
+++ b/tools/tesh2/examples/IO-bigsize.tesh
@@ -2013,7 +2013,7 @@ p And now, a read/write test
 < 997 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
 < 998 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
 < 999 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
 < 997 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
 < 998 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
 < 999 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r

-$ Cat\r
+$ cat\r

 > 000 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
 > 001 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
 > 002 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
 > 000 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
 > 001 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
 > 002 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r

diff --git a/tools/tesh2/examples/IO-orders.tesh b/tools/tesh2/examples/IO-orders.tesh
index a0a6b34..ec5aad5 100644 (file)
--- a/tools/tesh2/examples/IO-orders.tesh
+++ b/tools/tesh2/examples/IO-orders.tesh
@@ -4,36 +4,36 @@ p This tests that TESH accepts any order for the input/output
 p Order: in, out, cmd\r
 < < TOTO\r
 < > TOTO\r
 p Order: in, out, cmd\r
 < < TOTO\r
 < > TOTO\r

-< $ Cat\r
-$ ./tesh --log="log.thresh:info tesh.fmt:%m%n"\r
+< $ cat\r
+$ ../tesh --log="log.thresh:info tesh.fmt:%m%n"\r

 \r
 p Order: out, in, cmd\r
 < > TOTO\r
 < < TOTO\r
 \r
 p Order: out, in, cmd\r
 < > TOTO\r
 < < TOTO\r

-< $ Cat\r
-$ ./tesh --log="log.thresh:info tesh.fmt:%m%n"\r
+< $ cat\r
+$ ../tesh --log="log.thresh:info tesh.fmt:%m%n"\r

 \r
 p Order: out, cmd, in\r
 < > TOTO\r
 \r
 p Order: out, cmd, in\r
 < > TOTO\r

-< $ Cat\r
+< $ cat\r

 < < TOTO\r
 < < TOTO\r

-$ ./tesh --log="log.thresh:info tesh.fmt:%m%n"\r
+$ ../tesh --log="log.thresh:info tesh.fmt:%m%n"\r

 \r
 p Order: in, cmd, out\r
 < < TOTO\r
 \r
 p Order: in, cmd, out\r
 < < TOTO\r

-< $ Cat\r
+< $ cat\r

 < > TOTO\r
 < > TOTO\r

-$ ./tesh --log="log.thresh:info tesh.fmt:%m%n"\r
+$ ../tesh --log="log.thresh:info tesh.fmt:%m%n"\r

 \r
 p Order: cmd, out, in\r
 \r
 p Order: cmd, out, in\r

-< $ Cat\r
+< $ cat\r

 < > TOTO\r
 < < TOTO\r
 < > TOTO\r
 < < TOTO\r

-$ ./tesh --log="log.thresh:info tesh.fmt:%m%n"\r
+$ ../tesh --log="log.thresh:info tesh.fmt:%m%n"\r

 \r
 p Order: cmd, in, out\r
 \r
 p Order: cmd, in, out\r

-< $ Cat\r
+< $ cat\r

 < < TOTO\r
 < > TOTO\r
 < < TOTO\r
 < > TOTO\r

-$ ./tesh --log="log.thresh:info tesh.fmt:%m%n"\r
+$ ../tesh --log="log.thresh:info tesh.fmt:%m%n"\r

 \r
 \r

diff --git a/tools/tesh2/examples/README.tesh b/tools/tesh2/examples/README.tesh
index 9ec9183..f76a09b 100644 (file)
--- a/tools/tesh2/examples/README.tesh
+++ b/tools/tesh2/examples/README.tesh
@@ -32,12 +32,12 @@ are separated by blank lines). It is possible to place these lines either after
 the command or before. The difference between the two following chunks is\r
 mainly cosmetic in your testsuites, TESH don't care. (cf IO-orders.tesh)\r
 \r
 the command or before. The difference between the two following chunks is\r
 mainly cosmetic in your testsuites, TESH don't care. (cf IO-orders.tesh)\r
 \r

- $ Cat\r
+ $ cat\r

  < TOTO\r
  > TOTO\r
 \r
  > TOTO\r
  < TOTO\r
  > TOTO\r
 \r
  > TOTO\r

- $ Cat\r
+ $ cat\r

  < TOTO\r
 \r
 Nevertheless, it is possible to have several commands in the same block, but\r
  < TOTO\r
 \r
 Nevertheless, it is possible to have several commands in the same block, but\r


@@ -47,10 +47,10 @@ errors such as the following:
 \r
  $ cd toto\r
  > TOTO\r
 \r
  $ cd toto\r
  > TOTO\r

- $ Cat > file\r
+ $ cat > file\r

 \r
 TOTO will be passed to the cd command, where the user clearly want to pass it\r
 \r
 TOTO will be passed to the cd command, where the user clearly want to pass it\r

-to Cat.\r
+to cat.\r

 \r
 RETURN CODE\r
 -----------\r
 \r
 RETURN CODE\r
 -----------\r

diff --git a/tools/tesh2/examples/background.tesh b/tools/tesh2/examples/background.tesh
index e13b648..988eba8 100644 (file)
--- a/tools/tesh2/examples/background.tesh
+++ b/tools/tesh2/examples/background.tesh
@@ -34,7 +34,7 @@ $ cd temp_testdir
 <   }\r
 <   return 0;\r
 < }\r
 <   }\r
 <   return 0;\r
 < }\r

-$ Cat > delayed_cat.c\r
+$ cat > delayed_cat.c\r

 \r
 $ gcc -Wall -o delayed_cat delayed_cat.c\r
 \r
 \r
 $ gcc -Wall -o delayed_cat delayed_cat.c\r
 \r


@@ -42,7 +42,7 @@ $ gcc -Wall -o delayed_cat delayed_cat.c
 > TOTO\r
 \r
 < TOTO\r
 > TOTO\r
 \r
 < TOTO\r

-$ Cat > tmp_fich\r
+$ cat > tmp_fich\r

 \r
 $ sleep 2\r
 $ cd ..\r
 \r
 $ sleep 2\r
 $ cd ..\r

diff --git a/tools/tesh2/examples/basic.tesh b/tools/tesh2/examples/basic.tesh
index 6b7cd00..366c97a 100644 (file)
--- a/tools/tesh2/examples/basic.tesh
+++ b/tools/tesh2/examples/basic.tesh
@@ -4,9 +4,9 @@ p This is a basic test
 \r
 < TOTO \\r
 TUTU\r
 \r
 < TOTO \\r
 TUTU\r

-$ Cat > tmp_fich\r
+$ cat > tmp_fich\r

 \r
 \r

-$ Cat tmp_fich\r
+$ cat tmp_fich\r

 > TOTO TUTU\r
 \r
 $ rm tmp_fich\r
 > TOTO TUTU\r
 \r
 $ rm tmp_fich\r


@@ -17,9 +17,9 @@ p And now, some multilines examples
 < b\r
 < c\r
 < d\r
 < b\r
 < c\r
 < d\r

-$ Cat > tmp_fich\r
+$ cat > tmp_fich\r

 \r
 \r

-$ Cat tmp_fich\r
+$ cat tmp_fich\r

 > a\r
 > b\r
 > c\r
 > a\r
 > b\r
 > c\r

diff --git a/tools/tesh2/examples/bg-basic.tesh b/tools/tesh2/examples/bg-basic.tesh
index 2f78ae8..e6d72dc 100644 (file)
--- a/tools/tesh2/examples/bg-basic.tesh
+++ b/tools/tesh2/examples/bg-basic.tesh
@@ -4,7 +4,7 @@ p This is a basic test
 \r
 < TOTO \\r
 TUTU\r
 \r
 < TOTO \\r
 TUTU\r

-& Cat\r
+& cat\r

 > TOTO TUTU\r
 \r
 p And now, some multilines examples\r
 > TOTO TUTU\r
 \r
 p And now, some multilines examples\r


@@ -13,7 +13,7 @@ p And now, some multilines examples
 < b\r
 < c\r
 < d\r
 < b\r
 < c\r
 < d\r

-& Cat\r
+& cat\r

 > a\r
 > b\r
 > c\r
 > a\r
 > b\r
 > c\r

diff --git a/tools/tesh2/examples/bg-set-signal.tesh b/tools/tesh2/examples/bg-set-signal.tesh
index 8754728..f6e4be8 100644 (file)
--- a/tools/tesh2/examples/bg-set-signal.tesh
+++ b/tools/tesh2/examples/bg-set-signal.tesh
@@ -11,7 +11,7 @@ $ cd temp_testdir
 <   char *A=NULL;\r
 <   *A = 1;\r
 < }\r
 <   char *A=NULL;\r
 <   *A = 1;\r
 < }\r

-$ Cat > segfault.c\r
+$ cat > segfault.c\r

 \r
 $ gcc -o segfault segfault.c\r
 ! expect signal SIGSEGV\r
 \r
 $ gcc -o segfault segfault.c\r
 ! expect signal SIGSEGV\r

diff --git a/tools/tesh2/examples/catch-return.tesh b/tools/tesh2/examples/catch-return.tesh
index f42bdb6..d254e75 100644 (file)
--- a/tools/tesh2/examples/catch-return.tesh
+++ b/tools/tesh2/examples/catch-return.tesh
@@ -10,7 +10,7 @@ $ cd temp_testdir
 < int main(void) {\r
 <   exit(1);\r
 < }\r
 < int main(void) {\r
 <   exit(1);\r
 < }\r

-$ Cat > return1.c\r
+$ cat > return1.c\r

 \r
 $ gcc -o return1 return1.c\r
 \r
 \r
 $ gcc -o return1 return1.c\r
 \r

diff --git a/tools/tesh2/examples/catch-signal.tesh b/tools/tesh2/examples/catch-signal.tesh
index 874155d..5155d04 100644 (file)
--- a/tools/tesh2/examples/catch-signal.tesh
+++ b/tools/tesh2/examples/catch-signal.tesh
@@ -11,7 +11,7 @@ $ cd temp_testdir
 <   char *A=NULL;\r
 <   *A = 1;\r
 < }\r
 <   char *A=NULL;\r
 <   *A = 1;\r
 < }\r

-$ Cat > segfault.c\r
+$ cat > segfault.c\r

 \r
 $ gcc -o segfault segfault.c\r
 \r
 \r
 $ gcc -o segfault segfault.c\r
 \r


@@ -19,5 +19,6 @@ $ gcc -o segfault segfault.c
 < $ ./segfault\r
 $ ../tesh --log="log.thresh:info tesh.fmt:%m%n"\r
 \r
 < $ ./segfault\r
 $ ../tesh --log="log.thresh:info tesh.fmt:%m%n"\r
 \r

+\r

 $ cd ..\r
 $ rm -rf temp_testdir\r
 $ cd ..\r
 $ rm -rf temp_testdir\r

diff --git a/tools/tesh2/examples/catch-wrong-output.tesh b/tools/tesh2/examples/catch-wrong-output.tesh
index 8776420..1356a1e 100644 (file)
--- a/tools/tesh2/examples/catch-wrong-output.tesh
+++ b/tools/tesh2/examples/catch-wrong-output.tesh
@@ -2,11 +2,15 @@
 \r
 p This tests whether TESH detects wrong outputs\r
 \r
 \r
 p This tests whether TESH detects wrong outputs\r
 \r

-! expect return $EOUTPUTNOTMATCH\r
+! expect return 2\r

 < > TOTO\r
 < < TUTU\r
 < $ cat\r
 $ ./tesh --log="log.thresh:info tesh.fmt:%m%n"\r
 < > TOTO\r
 < < TUTU\r
 < $ cat\r
 $ ./tesh --log="log.thresh:info tesh.fmt:%m%n"\r

-\r
-\r
+> Test suite from stdin\r
+> [stdin:3] cat\r
+> Output of <stdin:3> mismatch:\r
+> - TOTO\r
+> + TUTU\r
+> Test suite `(stdin)': NOK (<stdin:3> output mismatch)\r

 \r
 \r

diff --git a/tools/tesh2/examples/cd.tesh b/tools/tesh2/examples/cd.tesh
index 500b6d1..1e175f1 100644 (file)
--- a/tools/tesh2/examples/cd.tesh
+++ b/tools/tesh2/examples/cd.tesh
@@ -12,6 +12,7 @@ $ ls
 # Check that tesh detects properly cd to non-existing directories\r
 ! expect return $ENOENT\r
 < $ cd toto\r
 # Check that tesh detects properly cd to non-existing directories\r
 ! expect return $ENOENT\r
 < $ cd toto\r

+\r

 $ ../tesh --log="log.thresh:info tesh.fmt:%m%n"\r
 \r
 # The next command checks that there is a testdir_temp in the upper directory, \r
 $ ../tesh --log="log.thresh:info tesh.fmt:%m%n"\r
 \r
 # The next command checks that there is a testdir_temp in the upper directory, \r

diff --git a/tools/tesh2/examples/set-ignore-output.tesh b/tools/tesh2/examples/set-ignore-output.tesh
index f091545..f77b51c 100644 (file)
--- a/tools/tesh2/examples/set-ignore-output.tesh
+++ b/tools/tesh2/examples/set-ignore-output.tesh
@@ -5,6 +5,6 @@ p This tests whether TESH accepts to ignore command output
 < ! output ignore\r
 < > TOTO\r
 < < TUTU\r
 < ! output ignore\r
 < > TOTO\r
 < < TUTU\r

-< $ Cat\r
-$ ./tesh --log="log.thresh:info tesh.fmt:%m%n"\r
+< $ cat\r
+$ ../tesh --log="log.thresh:info tesh.fmt:%m%n"\r

 \r
 \r

diff --git a/tools/tesh2/examples/set-return.tesh b/tools/tesh2/examples/set-return.tesh
index 204aded..a560075 100644 (file)
--- a/tools/tesh2/examples/set-return.tesh
+++ b/tools/tesh2/examples/set-return.tesh
@@ -10,7 +10,7 @@ $ cd temp_testdir
 < int main(void) {\r
 <   exit(1);\r
 < }\r
 < int main(void) {\r
 <   exit(1);\r
 < }\r

-$ Cat > return1.c\r
+$ cat > return1.c\r

 \r
 $ gcc -o return1 return1.c\r
 \r
 \r
 $ gcc -o return1 return1.c\r
 \r

diff --git a/tools/tesh2/examples/set-signal.tesh b/tools/tesh2/examples/set-signal.tesh
index ac872db..5e40c38 100644 (file)
--- a/tools/tesh2/examples/set-signal.tesh
+++ b/tools/tesh2/examples/set-signal.tesh
@@ -11,7 +11,7 @@ $ cd temp_testdir
 <   char *A=NULL;\r
 <   *A = 1;\r
 < }\r
 <   char *A=NULL;\r
 <   *A = 1;\r
 < }\r

-$ Cat > segfault.c\r
+$ cat > segfault.c\r

 \r
 $ gcc -o segfault segfault.c\r
 ! expect signal SIGSEGV\r
 \r
 $ gcc -o segfault segfault.c\r
 ! expect signal SIGSEGV\r