Changes in test_all.sh [b21cb9:e24c78]

File:

• test_all.sh (modified) (9 diffs)

test_all.sh

@@ -23 +23 @@
 docheck=0;
 docheck_mem=0;
+if [ -n "$TMPDIR" ]
+then
+  tmpdir="$TMPDIR";
+else
+  tmpdir="/tmp";
+fi
+tmppattern="MolecuilderTest";
 
 function usage(){
@@ -36 +43 @@
   echo "  -c                    Only configure and compile (implies -s)";
   echo "  -O <opt-level>        Only compile this optimization level";
-}
-
-while getopts “ho:f:scO:” OPTION
+  echo "  -t <tmpDir>           Use tmpDir as temporary directory";
+  echo "  -p <prefix>           Prefix to use for directory names (standart MolecuilderTest)";
+}
+
+while getopts “ho:f:scO:t:p:” OPTION
 do
   case $OPTION in
@@ -46 +55 @@
       ;;
    o)
-     outfile=$OPTARG;
+     outfile="$OPTARG";
      ;;
    f)
-     logfile=$OPTARG;
+     logfile="$OPTARG";
      ;;
    s)
@@ -61 +70 @@
      optimizations=("-O$OPTARG");
      ;;
+   t)
+     tmpdir="$OPTARG";
+     ;;
+   p)
+     tmppattern="$OPTARG";
+     ;;
    ?)
      usage;
@@ -68 +83 @@
 done
 
-if [[ -z $outfile ]] || [[ -z $logfile ]]
+# test if all arguments were provided
+if [[ -z "$outfile" ]] || [[ -z "$logfile" ]] || [[ -z "$tmpdir" ]] || [[ -z "$tmppattern" ]]
 then
   usage;
@@ -74 +90 @@
 fi
 
+# turn all relative paths into absolutes
 outfile=`realpath -s $outfile`;
 logfile=`realpath -s $logfile`;
+tmpdir=`realpath -s $tmpdir`;
 
 
@@ -98 +116 @@
   echo "Valgrinding";
   retval=0;
-  for test in molecuilder/src/unittests/*
+  for test in src/unittests/*
   do
     if [ -x "$test" ]
@@ -119 +137 @@
 
   echo "Testing with \"$2\"";
+  echo "" >> $logfile;
+  echo "" >> $logfile;
+  echo "" >> $logfile;
+  echo "Testing with \"$2\"" >> $logfile;
 
   echo -n "  Configuring: " >> $outfile;
@@ -167 +189 @@
 function run(){
   echo "Testing with \"$1\":" >> $outfile;
-  testdir=`mktemp -d --tmpdir MolecuilderTest.XXXXXXXXXX`;
+  testdir=`mktemp -d --tmpdir=$tmpdir $tmppattern.XXXXXXXXXX`;
   basedir=$PWD;
   cd $testdir;