1 files changed, 8 insertions, 5 deletions
diff --git a/test/mono/test.sh b/test/mono/test.sh
index 8a88e2e3..ec1b4638 100755
--- a/test/mono/test.sh
+++ b/test/mono/test.sh
@@ -16,6 +16,9 @@ cd "$OUTDIR"
 TESTONLY="$1"
 if [ -n "$TESTONLY" ]; then shift; fi
 
+LOG="$DIR/log"
+date > "$LOG"
+
 exec 3< "$DIR/tests"
 while read -u 3 TEST ARGS; do
   if [ -z "$TESTONLY" -o "$TEST" = "$TESTONLY" ]; then
@@ -27,12 +30,12 @@ while read -u 3 TEST ARGS; do
 #    ocamlc -I "$ZARITH" "$ZARITH/zarith.cma" -dllpath "$ZARITH" -I "$LEMDIR/ocaml-lib" "$LEMDIR/ocaml-lib/extract.cma" -I "$SAILDIR/src/_build/lem_interp" "$SAILDIR/src/_build/lem_interp/extract.cma" sail_values.ml testout.ml test.ml -o test
 #    ./test
    
-    echo "$TEST lem - ocaml"
+    echo "$TEST lem - ocaml" | tee -a -- "$LOG"
     rm -f -- "$OUTDIR"/*
-    "$SAILDIR/sail" -lem "$SAILDIR/lib/prelude.sail" "$DIR/$TEST".sail -o "$OUTDIR/testout" $ARGS $@
-    "$LEMDIR/bin/lem" -ocaml -lib "$SAILDIR/src/lem_interp" "$SAILDIR/src/gen_lib/sail_values.lem" "$SAILDIR/src/gen_lib/sail_operators_mwords.lem" "$SAILDIR/src/gen_lib/state.lem" testout_embed_types_sequential.lem testout_embed_sequential.lem -outdir "$OUTDIR"
+    "$SAILDIR/sail" -lem "$SAILDIR/lib/prelude.sail" "$DIR/$TEST".sail -o "$OUTDIR/testout" $ARGS $@ &>> "$LOG"
+    "$LEMDIR/bin/lem" -ocaml -lib "$SAILDIR/src/lem_interp" "$SAILDIR/src/gen_lib/sail_values.lem" "$SAILDIR/src/gen_lib/sail_operators_mwords.lem" "$SAILDIR/src/gen_lib/state.lem" testout_embed_types_sequential.lem testout_embed_sequential.lem -outdir "$OUTDIR" &>> "$LOG"
     cp -- "$DIR"/test.ml "$OUTDIR"
-    ocamlc -I "$ZARITH" "$ZARITH/zarith.cma" -dllpath "$ZARITH" -I "$LEMDIR/ocaml-lib" "$LEMDIR/ocaml-lib/extract.cma" -I "$SAILDIR/src/_build/lem_interp" "$SAILDIR/src/_build/lem_interp/extract.cma" sail_values.ml sail_operators_mwords.ml state.ml testout_embed_types_sequential.ml testout_embed_sequential.ml test.ml -o test
-    ./test
+    ocamlc -I "$ZARITH" "$ZARITH/zarith.cma" -dllpath "$ZARITH" -I "$LEMDIR/ocaml-lib" "$LEMDIR/ocaml-lib/extract.cma" -I "$SAILDIR/src/_build/lem_interp" "$SAILDIR/src/_build/lem_interp/extract.cma" sail_values.ml sail_operators_mwords.ml state.ml testout_embed_types_sequential.ml testout_embed_sequential.ml test.ml -o test &>> "$LOG"
+    ./test |& tee -a -- "$LOG" || tail -- "$LOG"
   fi
 done