ktest: Have the testing tmp dir include machine name

As multiple tests may be executed by the same server, have the test
machine name add uniqueness to the value of the temp directory.
Otherwise the temp directories may overwrite each other's tests.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index d0e1de6e4d1f06056787214919d5af17d84f8a54..24286cea14af3bf8cbd71574dfae4a634775df1e 100755 (executable)
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -27,7 +27,7 @@ $default{"TEST_TYPE"}         = "test";
 $default{"BUILD_TYPE"}         = "randconfig";
 $default{"MAKE_CMD"}           = "make";
 $default{"TIMEOUT"}            = 120;
-$default{"TMP_DIR"}            = "/tmp/ktest";
+$default{"TMP_DIR"}            = "/tmp/ktest/\${MACHINE}";
 $default{"SLEEP_TIME"}         = 60;   # sleep time between tests
 $default{"BUILD_NOCLEAN"}      = 0;
 $default{"REBOOT_ON_ERROR"}    = 0;

diff --git a/tools/testing/ktest/sample.conf b/tools/testing/ktest/sample.conf
index 1092e4759c1e754e96928f64e3f55c24ae82c962..e2d8d8338e9acccb7541abe8cda341ad7ab7018a 100644 (file)
--- a/tools/testing/ktest/sample.conf
+++ b/tools/testing/ktest/sample.conf
@@ -392,8 +392,8 @@
 #ADD_CONFIG = /home/test/config-broken
 
 # The location on the host where to write temp files
-# (default /tmp/ktest)
-#TMP_DIR = /tmp/ktest
+# (default /tmp/ktest/${MACHINE})
+#TMP_DIR = /tmp/ktest/${MACHINE}
 
 # Optional log file to write the status (recommended)
 #  Note, this is a DEFAULT section only option.