added TMPDIR for shunit, got rid of some extra noise

diff --git a/testkit/examples/blank_test.sh b/testkit/examples/blank_test.sh
index 47dfd3a6f12b4986f3eb040138bd041212f9f75e..239cbe73f205392df6c6f0814e38863a3ba89ed0 100644 (file)
--- a/testkit/examples/blank_test.sh
+++ b/testkit/examples/blank_test.sh
@@ -34,8 +34,8 @@ testSanity()
 
 testCleaningPriorTestRun()
 {
-  echo taking steps to clean last test...
-#if any.
+  # take steps to clean last test, if any are needed.
+  true
 }
 
 testDoAThing()
@@ -55,8 +55,8 @@ testDoAnotherThing()
 }
 
 oneTimeTearDown() {
-  echo cleaning up after test now...
-#if anything to do.
+  # cleaning up after test, if needed.
+  true
 }
 
 # load and run shUnit2

diff --git a/testkit/makefile b/testkit/makefile
index 115c1a2e034673777959a953f192e21c755e068b..9ecda0fd875dc46d857c413e95732caa8b358423 100644 (file)
--- a/testkit/makefile
+++ b/testkit/makefile
@@ -1,9 +1,5 @@
-include variables.def
 
-PROJECT = testkit
-FIRST_TARGETS += run_testkit_check
 
-include rules.def
+all:
+       @bash test_driver.sh
 
-run_testkit_check:
-       $(HIDESH) -c 'bash test_driver.sh'

diff --git a/testkit/prepare_tools.sh b/testkit/prepare_tools.sh
index 9186522eed70a00fcc94b18844ed2c3f4ab103a8..97aa6f2448dd22629659ac202403ea816d1a1ac9 100644 (file)
--- a/testkit/prepare_tools.sh
+++ b/testkit/prepare_tools.sh
@@ -43,6 +43,16 @@ GRITTY_TESTING_TOP_LEVEL="$(echo "$GRITTY_TESTING_TOP_LEVEL" | sed -e 's/\/cygdr
 # the top-level directory for tests, i.e. the root of testing hierarchy.
 export TESTKIT_ROOT="$GRITTY_TESTING_TOP_LEVEL"
 
+# location needed for shunit temporary files.
+export TMPDIR="$HOME/.shunit-temp"
+if [ ! -d "$TMPDIR" ]; then
+  mkdir -p "$TMPDIR"
+  if [ $? -ne 0 ]; then
+    echo "Failure during creation of TMPDIR for shunit!"
+    exit 1
+  fi
+fi
+
 # a bit of a dance to not pull in code too early...
 export TESTKIT_BOOTSTRAPPING=true
 source "$TESTKIT_ROOT/library/establish_environment.sh"