run test-suite on Alpine CI

Author: andres-erbsen

.github/workflows/alpine.yml

@@ -35,7 +35,7 @@ jobs:
       with:
         branch: ${{ matrix.alpine }}
         extra-repositories: https://dl-cdn.alpinelinux.org/alpine/edge/testing
-        packages: rocq dune  bash python3 graphviz  make
+        packages: rocq dune  bash python3 graphviz  make findutils diffutils grep rsync
     - name: 'dune build @stdlib-html # depends on stdlib'
       shell: alpine.sh {0}
       run: 'dune build @stdlib-html # depends on stdlib'
@@ -49,7 +49,6 @@ jobs:
     - name: Check for duplicate files
       shell: alpine.sh {0}
       run: dev/tools/check-duplicate-files.sh
-    - name: 'COQEXTRAFLAGS=... make -C test-suite -j -k'
+    - name: 'make -j -k test-suite'
       shell: alpine.sh {0}
-      run: 'COQEXTRAFLAGS="-Q _build/install/default/lib/coq/user-contrib/Stdlib/ Stdlib" make -C test-suite -j -k'
-      continue-on-error: true
+      run: 'make -j -k test-suite'

Makefile

@@ -1,6 +1,6 @@
 DUNE=dev/with-rocq-wrap.sh dune
 
-.PHONY: clean all install dune dune-install
+.PHONY: clean all install dune dune-install test-suite
 
 all install:
 	+$(MAKE) -j -C theories $@
@@ -24,5 +24,11 @@ refman-html:
 stdlib-html:
 	$(DUNE) build --root . @stdlib-html
 
+test-suite:
+	test -d _build/default/theories/
+	+COQEXTRAFLAGS="-Q ../_build/default/theories/ Stdlib" \
+	COQCHKEXTRAFLAGS="$$COQEXTRAFLAGS" \
+	$(MAKE) -C test-suite
+
 clean:
 	+$(MAKE) -C theories clean

test-suite/Makefile

@@ -30,11 +30,15 @@ else
   export FINDLIB_SEP=:
 endif
 
+# these variables are meant to be overridden if you want to add *extra* flags
 COQEXTRAFLAGS?=
+COQCHKEXTRAFLAGS?=
+
 COQFLAGS?=$(COQEXTRAFLAGS)
+COQCHKFLAGS?=-silent -o $(COQCHKEXTRAFLAGS)
 
 coqc := rocq c -q -R prerequisite TestSuite $(COQFLAGS)
-coqchk := rocqchk -R prerequisite TestSuite
+coqchk := rocqchk -R prerequisite TestSuite $(COQCHKFLAGS)
 coqdoc := rocq doc
 coqtop := rocq repl -q -test-mode -R prerequisite TestSuite