From 75a383f8746398463787fa9a8505f417f2ca3eae Mon Sep 17 00:00:00 2001 From: mquinson Date: Wed, 31 Mar 2010 16:19:59 +0000 Subject: [PATCH] use differing temporary directory names so that the tests can be run in // git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7408 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- tools/tesh/background.tesh | 8 ++++---- tools/tesh/bg-set-signal.tesh | 8 ++++---- tools/tesh/catch-return.tesh | 8 ++++---- tools/tesh/catch-signal.tesh | 8 ++++---- tools/tesh/cd.tesh | 14 +++++++------- tools/tesh/set-return.tesh | 8 ++++---- tools/tesh/set-signal.tesh | 8 ++++---- tools/tesh/setenv.tesh | 8 ++++---- 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/tools/tesh/background.tesh b/tools/tesh/background.tesh index a3d196bb4c..e03da443d7 100644 --- a/tools/tesh/background.tesh +++ b/tools/tesh/background.tesh @@ -1,7 +1,7 @@ -$ rm -rf temp_testdir -$ mkdir temp_testdir -$ cd temp_testdir +$ rm -rf temp_testdir_background +$ mkdir temp_testdir_background +$ cd temp_testdir_background < #include < #include @@ -46,5 +46,5 @@ $ mkfile tmp_fich $ sleep 2 $ cd .. -$ rm -rf temp_testdir +$ rm -rf temp_testdir_background diff --git a/tools/tesh/bg-set-signal.tesh b/tools/tesh/bg-set-signal.tesh index adb8b99fda..3efe2c359d 100644 --- a/tools/tesh/bg-set-signal.tesh +++ b/tools/tesh/bg-set-signal.tesh @@ -2,10 +2,10 @@ # This suite builds and uses a program raising a segfault, ie a program dying # of SIGSEV. tesh must detect this condition and report the issue. -$ rm -rf temp_testdir -$ mkdir temp_testdir +$ rm -rf temp_testdir-bg-set-signal +$ mkdir temp_testdir-bg-set-signal -$ cd temp_testdir +$ cd temp_testdir-bg-set-signal < #include < int main(void) { < char *A=NULL; @@ -18,4 +18,4 @@ $ gcc -o segfault segfault.c & ./segfault $ sleep 1 $ cd .. -$ rm -rf temp_testdir +$ rm -rf temp_testdir-bg-set-signal diff --git a/tools/tesh/catch-return.tesh b/tools/tesh/catch-return.tesh index 12a3699b06..20784e72ad 100644 --- a/tools/tesh/catch-return.tesh +++ b/tools/tesh/catch-return.tesh @@ -2,10 +2,10 @@ # This suite builds and uses a program returning 1. # tesh must detect this condition and report the issue. -$ rm -rf temp_testdir -$ mkdir temp_testdir +$ rm -rf temp_testdir-catch-return +$ mkdir temp_testdir-catch-return -$ cd temp_testdir +$ cd temp_testdir-catch-return < #include < int main(void) { < exit(1); @@ -24,4 +24,4 @@ $ ../tesh --log='log.thresh:info tesh.fmt:%m%n' > || $ cd .. -$ rm -rf temp_testdir +$ rm -rf temp_testdir-catch-return diff --git a/tools/tesh/catch-signal.tesh b/tools/tesh/catch-signal.tesh index 2c85e6237d..c9f9fec146 100644 --- a/tools/tesh/catch-signal.tesh +++ b/tools/tesh/catch-signal.tesh @@ -2,10 +2,10 @@ # This suite builds and uses a program raising a segfault, ie a program dying # of SIGSEV. tesh must detect this condition and report the issue. -$ rm -rf temp_testdir -$ mkdir temp_testdir +$ rm -rf temp_testdir-catch-signal +$ mkdir temp_testdir-catch-signal -$ cd temp_testdir +$ cd temp_testdir-catch-signal < #include < int main(void) { < char *A=NULL; @@ -25,4 +25,4 @@ $ ../tesh --log='log.thresh:info tesh.fmt:%m%n' > || $ cd .. -$ rm -rf temp_testdir +$ rm -rf temp_testdir-catch-signal diff --git a/tools/tesh/cd.tesh b/tools/tesh/cd.tesh index d52a2ac42b..221ea43715 100644 --- a/tools/tesh/cd.tesh +++ b/tools/tesh/cd.tesh @@ -2,11 +2,11 @@ # This example uses the cd command -$ rm -rf testdir_temp -$ mkdir testdir_temp -$ cd testdir_temp +$ rm -rf testdir_temp-cd +$ mkdir testdir_temp-cd +$ cd testdir_temp-cd -# Check that there is nothing in the current dir (which must be testdir_temp) +# Check that there is nothing in the current dir (which must be testdir_temp-cd) $ ls # Check that tesh detects properly cd to non-existing directories @@ -17,9 +17,9 @@ $ ls > Test suite `(stdin)': NOK (system error) $ ../tesh --log='log.thresh:info tesh.fmt:%m%n' -# The next command checks that there is a testdir_temp in the upper directory, +# The next command checks that there is a testdir_temp-cd in the upper directory, # ie that mkdir and cd both worked. -$ test -e ../testdir_temp +$ test -e ../testdir_temp-cd $ cd .. -$ rmdir testdir_temp +$ rmdir testdir_temp-cd diff --git a/tools/tesh/set-return.tesh b/tools/tesh/set-return.tesh index a87aa16757..ff0dd17760 100644 --- a/tools/tesh/set-return.tesh +++ b/tools/tesh/set-return.tesh @@ -2,10 +2,10 @@ # This suite builds and uses a program returning 1. # tesh is instructed of this return code and must not whine. -$ rm -rf temp_testdir -$ mkdir temp_testdir +$ rm -rf temp_testdir-set-return +$ mkdir temp_testdir-set-return -$ cd temp_testdir +$ cd temp_testdir-set-return < #include < int main(void) { < exit(1); @@ -17,4 +17,4 @@ $ gcc -o return1 return1.c ! expect return 1 $ ./return1 $ cd .. -$ rm -rf temp_testdir +$ rm -rf temp_testdir-set-return diff --git a/tools/tesh/set-signal.tesh b/tools/tesh/set-signal.tesh index 3333d082c8..43f105e06e 100644 --- a/tools/tesh/set-signal.tesh +++ b/tools/tesh/set-signal.tesh @@ -2,10 +2,10 @@ # This suite builds and uses a program raising a segfault, ie a program dying # of SIGSEV. tesh must detect this condition and report the issue. -$ rm -rf temp_testdir -$ mkdir temp_testdir +$ rm -rf temp_testdir-set-signal +$ mkdir temp_testdir-set-signal -$ cd temp_testdir +$ cd temp_testdir-set-signal < #include < int main(void) { < char *A=NULL; @@ -17,4 +17,4 @@ $ gcc -o segfault segfault.c ! expect signal SIGSEGV $ ./segfault $ cd .. -$ rm -rf temp_testdir +$ rm -rf temp_testdir-set-signal diff --git a/tools/tesh/setenv.tesh b/tools/tesh/setenv.tesh index 197dba9718..72d5566d33 100644 --- a/tools/tesh/setenv.tesh +++ b/tools/tesh/setenv.tesh @@ -2,10 +2,10 @@ # This suite builds and uses a program returning 1. # tesh is instructed of this return code and must not whine. -$ rm -rf temp_testdir -$ mkdir temp_testdir +$ rm -rf temp_testdir-setenv +$ mkdir temp_testdir-setenv -$ cd temp_testdir +$ cd temp_testdir-setenv < #include < #include @@ -28,4 +28,4 @@ $ ./getenv > tesh_test_toto=blah $ cd .. -$ rm -rf temp_testdir +$ rm -rf temp_testdir-setenv -- 2.20.1