Do not generate .result

Result directory can be recognized by presence of plot.sh.
Additionally generate plot.sh at the end of measurement to have it only
in directories where the measurement was successfully completed.

diff --git a/gw-tests/genhtml/genhtml.py b/gw-tests/genhtml/genhtml.py
index fc7620bbcf392aeb3d735a8eb929ce6f4875aa08..be1bb4e880688eac7d8cd9cfdb6f6fc97ef3e806 100755 (executable)
--- a/gw-tests/genhtml/genhtml.py
+++ b/gw-tests/genhtml/genhtml.py
@@ -134,7 +134,7 @@ class DimensionTraffic(Dimension):
 class Test(object):
     @classmethod
     def isOnPath(cls, path):
-       f = os.path.join(path, '.results')
+       f = os.path.join(path, 'plot.sh')
        return os.path.isfile(f)
     def __init__(self, path, values, tests=None):
        self.path = path

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 739333c2227e353b387d5e01fb51e0a8e902a526..63ea7603573db79816827579e7fe91e1c34975fe 100644 (file)
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -105,17 +105,6 @@ kill_load() {
 _measure() {
     # Remove data from the last measurement
     rm -rf *
-    touch .results
-    cat > plot.sh <<-EOF
-       #!/bin/bash
-       export kvers=$kvers
-       export hostkvers=$hostkvers
-       export traffic=$traffic
-       export load=$load
-       cd \$(dirname \$0)/$(dirname $script)
-       exec ./$(basename $script) --plot "\$@"
-       EOF
-    chmod +x plot.sh
     # Kill load generators left possibly from the past runs
     killall -q ping || :
     killall -q latester || :
@@ -138,6 +127,19 @@ _measure() {
     start_load
     main
     kill_load
+
+    # Create a plot script at the end to signalize that the
+    # measurement was successfully finished
+    cat > plot.sh <<-EOF
+       #!/bin/bash
+       export kvers=$kvers
+       export hostkvers=$hostkvers
+       export traffic=$traffic
+       export load=$load
+       cd \$(dirname \$0)/$(dirname $script)
+       exec ./$(basename $script) --plot "\$@"
+       EOF
+    chmod +x plot.sh
 }