From c6dbaa3de23abf05635b006900908efcf01e78f2 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Fri, 24 Mar 2023 14:26:41 -0300
Subject: Makefile: Split Guix tests from build

---
 Makefile | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 979e707..c63bb41 100644
--- a/Makefile
+++ b/Makefile
@@ -48,34 +48,17 @@ result-packages result-packages.sentinel: \
 		-f src/org/euandre/queue.scm
 	touch result-packages.sentinel
 
-local-files = \
-	/etc/postfix/master.cf \
-	/etc/postfix/main.cf   \
-
-internet-files = \
-	$(local-files)            \
-	/etc/sasl2/smtpd.conf     \
-	/etc/dkimproxyout.conf    \
-	/etc/dovecot/dovecot.conf \
-
 result-services.sentinel: result-local.sentinel result-internet.sentinel
 	touch $@
 
 result-local result-local.sentinel: result-packages.sentinel
 	rm -f result-local
 	guix system -v3 -Lsrc/ -K -r result-local build tests/local/system.scm
-	for f in $(local-files); do \
-		diff -U5 --color=always result-local$$f tests/local$$f; \
-	done
 	touch result-local.sentinel
 
-result-internet result-internet.sentinel: \
-		result-packages.sentinel $(test-config-files)
+result-internet result-internet.sentinel: result-packages.sentinel
 	rm -f result-internet
 	guix system -v3 -Lsrc/ -K -r result-internet build tests/internet/system.scm
-	for f in $(internet-files); do \
-		diff -U5 --color=always result-internet$$f tests/internet$$f; \
-	done
 	touch result-internet.sentinel
 
 
@@ -122,6 +105,24 @@ clean:
 		*.sentinel                                                     \
 
 
+local-files = \
+	/etc/postfix/master.cf \
+	/etc/postfix/main.cf   \
+
+internet-files = \
+	$(local-files)            \
+	/etc/sasl2/smtpd.conf     \
+	/etc/dkimproxyout.conf    \
+	/etc/dovecot/dovecot.conf \
+
+check-guix: $(test-config-files)
+	for f in $(local-files); do \
+		diff -U5 --color=always result-local$$f tests/local$$f; \
+	done
+	for f in $(internet-files); do \
+		diff -U5 --color=always result-internet$$f tests/internet$$f; \
+	done
+
 HTTP-REMOTE = 'https://euandre.org/s/package-repository'
 GIT-REMOTE  = 'git://euandre.org/package-repository'
 check-ubuntu-x86_64-deb:
@@ -137,4 +138,4 @@ check-debian-x86_64-deb:
 
 check-debian: check-debian-x86_64-deb
 
-check: check-ubuntu check-debian
+check: check-guix check-ubuntu check-debian
-- 
cgit v1.2.3