From 127dcbaaa553b2b36fa187dc5a19a0e859b7856b Mon Sep 17 00:00:00 2001
From: pad <pad@r2c.dev>
Date: Mon, 22 Apr 2024 21:46:51 +0200
Subject: [PATCH] Augment test.sh to test other xix programs

This is possible now that we compile all xix
---
 .github/workflows/build-and-test.jsonnet | 12 ++++++------
 .github/workflows/build-and-test.yml     |  6 +++---
 test.sh                                  |  7 +++++++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-and-test.jsonnet b/.github/workflows/build-and-test.jsonnet
index e5ef6cd..e9aeb0c 100644
--- a/.github/workflows/build-and-test.jsonnet
+++ b/.github/workflows/build-and-test.jsonnet
@@ -64,12 +64,6 @@ local job = {
         ./bootstrap-mk.sh
       |||,
     },
-    {
-      name: 'Basic test',
-      run: |||
-        ./test.sh
-      |||,
-    },
     {
       name: 'Build all xix',
       run: |||
@@ -80,6 +74,12 @@ local job = {
         mk
       |||,
     },
+    {
+      name: 'Basic test',
+      run: |||
+        ./test.sh
+      |||,
+    },
   ],
 };
 
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 88f65d2..d145f0a 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -16,9 +16,6 @@ jobs:
         run: |
           eval $(opam env)
           ./bootstrap-mk.sh
-      - name: Basic test
-        run: |
-          ./test.sh
       - name: Build all xix
         run: |
           eval $(opam env)
@@ -26,6 +23,9 @@ jobs:
           export PATH=`pwd`/bin:$PATH
           mk depend
           mk
+      - name: Basic test
+        run: |
+          ./test.sh
     strategy:
       matrix:
         ocaml-compiler:
diff --git a/test.sh b/test.sh
index 8b62a4b..f459b43 100755
--- a/test.sh
+++ b/test.sh
@@ -14,3 +14,10 @@ set -x
 # or dynamic linking errors
 ./bin/mk --help
 ./bin/rc --help
+./assembler/5a --help
+./linker/5l --help
+./compiler/5c --help
+# TODO: add a --help, and exit 0 on --help, not 2
+#./lex/ocamllex --help
+#./yacc/ocamlyacc --help
+#./version-control/ogit --help