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 591c671984dd1fc8c6f5d72766b821914a3ebe52..c92366242a7d96dda914116b24f730d70c545e4e 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 a0a6b34ce37982145d9d4f87a2f6a15f8ea83dcb..ec5aad5637525c8df6a790a3f8f1fe1b9bbacf64 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 9ec918360eb766768b06fd6c36312a6a20e11f42..f76a09beda628235118ce2ff1feff0ddd8d528bc 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 e13b648e3d55e5e6b9883f99f32d46f97980f2a5..988eba84698fede31e61af6188616be49ae70527 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 6b7cd00b61fb87d94df57cdb17827166b953906e..366c97a4d8139323cc0da81fe08dd55c84d126ad 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 2f78ae8529742caa450593290d8ed66a0892f832..e6d72dc3b02580a1d0e2755584f3544fab94923c 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 8754728b3648e9ffe550652e83dd467622147e3c..f6e4be8255211298ac66e06491369e8be8cdfc4d 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 f42bdb6b0e549352b9ccc9ef1c805074b7745c97..d254e754b27124cba45dad4ec267d267e839c026 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 874155d56f03a2967aa0265e6206ebd928eda80c..5155d0473f9950a1b89666a71f247c2a9b31de29 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 877642045bd48109a3fffd5f5ea5679841e72f4b..1356a1e7e340696ade6833e3d229b21d89bf8175 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 500b6d18af249a5e365d7952b6f906be0d4dd611..1e175f1eee08163df2b2fb8ee4725d147e1b391a 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 f091545c6a3b973962548ea9234d078ae832cd9f..f77b51cc78da034206e1ef0c5210d8c48b09c951 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 204aded5fc303ee31ad591051bef584f14479d96..a560075683ce8c0c53146a6fbf7000c9be4b37d8 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 ac872db56900d2caae03a2b4f82c34ef44f59b61..5e40c38c94e583bdb24a5788a0a3f06f7eb812a1 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