Improve shell scripts

2 files changed, 16 insertions, 18 deletions

diff --git a/test-suite/coq-makefile/timing/precomputed-time-tests/run.sh b/test-suite/coq-makefile/timing/precomputed-time-tests/run.sh
index a918cceb6..9f3b648aa 100755
--- a/test-suite/coq-makefile/timing/precomputed-time-tests/run.sh
+++ b/test-suite/coq-makefile/timing/precomputed-time-tests/run.sh
@@ -4,7 +4,8 @@ set -x
 set -e
 
 cd "$(dirname "${BASH_SOURCE[0]}")"
-export COQLIB="$(cd ../../../.. && pwd)"
+COQLIB="$(cd ../../../.. && pwd)"
+export COQLIB
 
-./001-correct-diff-sorting-order/run.sh || exit $?
-./002-single-file-sorting/run.sh || exit $?
+./001-correct-diff-sorting-order/run.sh
+./002-single-file-sorting/run.sh
diff --git a/test-suite/coq-makefile/timing/run.sh b/test-suite/coq-makefile/timing/run.sh
index 43c83e412..11a04d5c2 100755
--- a/test-suite/coq-makefile/timing/run.sh
+++ b/test-suite/coq-makefile/timing/run.sh
@@ -58,16 +58,14 @@ TO_SED_IN_PER_LINE=(
     -e s'/+/-/g' # some code lines don't really change, but this can show up as either -0m00.01s or +0m00.01s, so we need to normalize the signs
     )
 
-for ext in "" .desired; do
-    for file in time-of-build-before.log time-of-build-after.log time-of-build-both.log; do
-        cat ${file}${ext} | grep -v 'warning: undefined variable' | sed "${TO_SED_IN_BOTH[@]}" "${TO_SED_IN_PER_FILE[@]}" > ${file}${ext}.processed
-    done
-done
 for file in time-of-build-before.log time-of-build-after.log time-of-build-both.log; do
-    echo "cat $file"
-    cat "$file"
-    echo
-    diff -u $file.desired.processed $file.processed || exit $?
+  for ext in "" .desired; do
+    grep -v 'warning: undefined variable' < ${file}${ext} | sed "${TO_SED_IN_BOTH[@]}" "${TO_SED_IN_PER_FILE[@]}" > ${file}${ext}.processed
+  done
+  echo "cat $file"
+  cat "$file"
+  echo
+  diff -u $file.desired.processed $file.processed || exit $?
 done
 
 cd ../per-file-before
@@ -92,13 +90,12 @@ echo "cat A.v.timing.diff"
 cat A.v.timing.diff
 echo
 
+file=A.v.timing.diff
+
 for ext in "" .desired; do
-    for file in A.v.timing.diff; do
-        cat ${file}${ext} | sed "${TO_SED_IN_BOTH[@]}" "${TO_SED_IN_PER_LINE[@]}" | sort > ${file}${ext}.processed
-    done
-done
-for file in A.v.timing.diff; do
-    diff -u $file.desired.processed $file.processed || exit $?
+    sed "${TO_SED_IN_BOTH[@]}" "${TO_SED_IN_PER_LINE[@]}" < "${file}${ext}" | sort > "${file}${ext}.processed"
 done
 
+diff -u "$file.desired.processed" "$file.processed" || exit $?
+
 exit 0