Do not generate .result
authorMichal Sojka <sojkam1@fel.cvut.cz>
Sat, 11 Dec 2010 11:09:20 +0000 (12:09 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Sat, 11 Dec 2010 11:09:20 +0000 (12:09 +0100)
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.

gw-tests/genhtml/genhtml.py
gw-tests/lib.sh

index fc7620b..be1bb4e 100755 (executable)
@@ -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
index 739333c..63ea760 100644 (file)
@@ -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
 }