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

diff --git a/tools/tesh/background.tesh b/tools/tesh/background.tesh
index a3d196b..e03da44 100644 (file)
--- 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 <unistd.h>
 < #include <stdlib.h>
@@ -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 adb8b99..3efe2c3 100644 (file)
--- 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 <stdlib.h>
 < 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 12a3699..20784e7 100644 (file)
--- 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 <stdlib.h>
 < 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 2c85e62..c9f9fec 100644 (file)
--- 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 <stdlib.h>
 < 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 d52a2ac..221ea43 100644 (file)
--- 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 a87aa16..ff0dd17 100644 (file)
--- 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 <stdlib.h>
 < 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 3333d08..43f105e 100644 (file)
--- 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 <stdlib.h>
 < 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 197dba9..72d5566 100644 (file)
--- 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 <string.h>
 < #include <stdio.h>
@@ -28,4 +28,4 @@ $ ./getenv
 > tesh_test_toto=blah
 
 $ cd ..
-$ rm -rf temp_testdir
+$ rm -rf temp_testdir-setenv