From 1003d80ac90ef2a4056ee561b439f89021407d35 Mon Sep 17 00:00:00 2001
From: Carl Gay <carlgay@gmail.com>
Date: Sun, 29 Dec 2024 13:39:44 -0500
Subject: [PATCH] Makefile: add test-submodules target

...and remove "build" as dependency of "test" target. No need to waste time linking the
deft-app exe when we run tests.
---
 .github/workflows/build-and-test.yml | 10 ++++++++++
 Makefile                             | 15 +++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 4c9dc4d..881fc56 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -40,6 +40,8 @@ jobs:
         run: |
           mkdir -p ${DYLAN}
           make install
+          ls -l dylan-root/bin/
+          ldd dylan-root/bin/deft
 
       - name: Exercise deft
         env:
@@ -55,3 +57,11 @@ jobs:
           ${exe} list
           ${exe} build abc-test-suite
           _build/bin/abc-test-suite
+
+      - name: Run test suite using submodules
+        env:
+          DYLAN_CATALOG: ext/pacman-catalog
+          DYLAN: dylan-root
+        run: |
+          mkdir -p ${DYLAN}
+          make test-submodules
diff --git a/Makefile b/Makefile
index 9cd3353..adb0b74 100644
--- a/Makefile
+++ b/Makefile
@@ -29,19 +29,26 @@ build-with-version:
 really-install:
 	mkdir -p $(DYLAN)/bin
 	cp _build/sbin/deft-app $(DYLAN)/bin/deft
-	ln -f $(DYLAN)/bin/deft $(DYLAN)/bin/{deft-app,dylan}
+	ln -f $(DYLAN)/bin/deft $(DYLAN)/bin/deft-app
+	ln -f $(DYLAN)/bin/deft $(DYLAN)/bin/dylan
 
 install: build-with-version really-install
 
 # Build and install without the version hacking above.
 install-debug: build really-install
 
-# Deft needs to be buildable with submodules so that it can be built on
-# new platforms without having to manually install deps.
-test: build
+# Normal development and testing is done with Deft itself.
+test:
+	$(DEFT_EXE) update
 	$(DEFT_EXE) build deft-test-suite \
 	  && DYLAN_CATALOG=ext/pacman-catalog _build/bin/deft-test-suite
 
+# Deft also needs to be buildable with submodules so that it can be built on new
+# platforms without having to manually install deps.
+test-submodules: distclean
+	dylan-compiler -build deft-test-suite \
+	  && DYLAN_CATALOG=ext/pacman-catalog _build/bin/deft-test-suite
+
 dist: distclean install
 
 clean: