tester/controller: better test-result layout

Make sure that on tester machine everything is put into
$DTF_RESULTDIR.  Similarly, on controller machine, everything
should be put into --workdir.

* controller/run_remote: Detect $srcdir.
(workdir_prereq): The $opt_workdir is temporary directory by
default.
* tester/run (run): Task results now go into $DTF_RESULTDIR/tasks.
The main xml result goes into $DTF_RESULT/dtf.xml.

1 files changed, 5 insertions, 5 deletions

diff --git a/tester/run b/tester/run
index 55b87b8..b05c024 100755
--- a/tester/run
+++ b/tester/run
@@ -11,7 +11,7 @@ export DTF_RESULTDIR=${DTF_RESULTDIR-/var/tmp/dtf}
 # when exists per-testsuite config.sh, source it here
 test -r "$srcdir/config.sh" && . "$srcdir/config.sh"
 
-export dtf_resultxml_file=/var/tmp/dtf.xml
+export dtf_resultxml_file="$DTF_RESULTDIR/dtf.xml"
 
 export dtf_option_verbose=0
 export dtf_option_force=0
@@ -72,7 +72,7 @@ run()
 
     (   cd "$dtf_workdir"
 
-        outlog="$DTF_RESULTDIR/$dtf_test_id.log"
+        outlog="$DTF_RESULTDIR/tasks/$dtf_test_id.log"
         output_wrapper="cat > $outlog"
 
         test $dtf_option_verbose = 1 \
@@ -102,12 +102,12 @@ run()
             rv=$?
 
             test -n "$DTF_RESULT_TARBALL" \
-                && cp "$DTF_RESULT_TARBALL" "$DTF_RESULTDIR/$dtf_test_id.tar.gz"
+                && cp "$DTF_RESULT_TARBALL" "$DTF_RESULTDIR/tasks/$dtf_test_id.tar.gz"
 
             {   echo "---"
                 echo "exit_status: $rv"
                 echo "finished: \"$(date)\""
-            } >> "$DTF_RESULTDIR/$dtf_test_id.result"
+            } >> "$DTF_RESULTDIR/tasks/$dtf_test_id.result"
 
             exit $rv
         ) 2>&1 | eval "$output_wrapper"
@@ -126,7 +126,7 @@ prepare_resultdir()
         rm -rf "$DTF_RESULTDIR" || die "can not remove $DTF_RESULTDIR"
     fi
 
-    mkdir -p "$DTF_RESULTDIR" || die "can not create $DTF_RESULTDIR"
+    mkdir -p "$DTF_RESULTDIR/tasks" || die "can not create $DTF_RESULTDIR"
 }
 
 show_help()