From 6e2d23821800fc765e56dbe168de23203c6e7880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20Mart=C3=ADnez?= <mtzguido@gmail.com>
Date: Sat, 2 Dec 2023 14:38:59 -0800
Subject: [PATCH] everest: some refactoring in test command

---
 everest | 77 ++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 57 insertions(+), 20 deletions(-)

diff --git a/everest b/everest
index 03e6d56b..eb1df1ce 100755
--- a/everest
+++ b/everest
@@ -980,32 +980,69 @@ do_make ()
   green "SUCCESS"
 }
 
-do_test () {
-  check_no_archive
-  setup_env
+test_FStar () {
+  $MAKE -C FStar ci-uregressions $make_opts
+}
 
-  separator
-  blue "Running tests (commands shown below)"
-  set -x
-  # pulse
+test_karamel () {
+  LD_LIBRARY_PATH= $MAKE -C karamel/test $make_opts everything
+}
+test_pulse () {
   $MAKE -C pulse test $make_opts
-  # steel
+}
+test_steel () {
   $MAKE -C steel test $make_opts
-  # karamel
-  LD_LIBRARY_PATH= $MAKE -C karamel/test $make_opts everything
-  # evercrypt
-  # LD_LIBRARY_PATH is already taken care of by the HACL* Makefile
-  LD_LIBRARY_PATH= $MAKE -C hacl-star test $make_opts
-  # everquic-crypto
-  make -C merkle-tree $make_opts test
-  # everparse
-  $MAKE -C everparse $make_opts test
-  # everquic-crypto
-  make -C everquic-crypto $make_opts test
-  # mitls; note: these tests make assumption on their current working directory
+}
+
+test_hacl-star () {
+  # No need to run dependency analysis again
+  NODEPEND=1 $MAKE -C hacl-star test $make_opts
+}
+
+test_merkle-tree () {
+  $MAKE -C merkle-tree test $make_opts
+}
+test_everparse () {
+  $MAKE -C everparse test $make_opts
+}
+
+test_everquic-crypto () {
+  $MAKE -C everquic-crypto test $make_opts
+}
+
+test_mitls-fstar () {
   (cd mitls-fstar/src/tls && $MAKE $make_opts test)
   # (cd mitls-fstar/apps/cmitls && $MAKE $keep_going_opt test)
   # (cd mitls-fstar/apps/quicMinusNet && $MAKE $keep_going_opt test)
+}
+
+do_test () {
+  check_no_archive
+  setup_env
+
+  separator
+  blue "Running tests"
+
+  # Order SHOULD NOT matter
+  for p in FStar karamel pulse steel hacl-star merkle-tree everparse everquic-crypto mitls-fstar; do
+    # For individual components, we set ALL_PROJECTS=foo
+    if [[ ${ALL_PROJECTS/$p/} == $ALL_PROJECTS ]]; then
+      continue
+    fi
+    separator
+    blue "Testing $p"
+    blue "Running: test_$p"
+    blue "$(type test_$p)"
+    if ! test_$p ; then
+      separator
+      red "FAILURE: testing failed for $p"
+      return 2
+    fi
+    separator
+    echo -e "\n\n"
+  done
+
+  green "SUCCESS"
   set +x
   separator
 }