Fix

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

benchmark/entrypoint.sh

@@ -8,15 +8,14 @@ set -o nounset
 # mounted rather than built in, since it could only be taken with a server up.
 # Both are said at once, with the indexer first, so the answer reads as one
 # group after another
-RESULTS="$(mktemp -d)"
-clean() { rm -rf "$RESULTS"; }
-trap clean EXIT
+set -- /benchmark.json
 
-cp /benchmark.json "$RESULTS/index.json"
+for RESULT in /results/*.json
+do
+  if [ -f "$RESULT" ]
+  then
+    set -- "$@" "$RESULT"
+  fi
+done
 
-if [ -d /results ]
-then
-  find /results -maxdepth 1 -name '*.json' -exec cp {} "$RESULTS/" \;
-fi
-
-jq --slurp 'add' "$RESULTS"/*.json
+jq --slurp 'add' "$@"

test/e2e/common.mk

@@ -39,9 +39,9 @@ test-hurl:
 
 # A suite that carries a script saying what it wants measured is measured
 # before its tests run, so what is timed is an instance warmed deliberately
-# rather than one that has just served a whole test suite. A run that stops
-# part way through leaves nothing behind, as a partial answer that reads like a
-# complete one is worse than no answer at all
+# rather than one that has just served a whole test suite. What a run writes is
+# named apart until it is complete, so a run that stops part way through cannot
+# leave behind a partial answer that reads like a whole one
 .PHONY: test-benchmark
 test-benchmark:
 ifneq ($(wildcard benchmark.py),)