Use dune's include stanza for generated tests

.github/workflows/build.yml

@@ -48,9 +48,6 @@ jobs:
       - name: Build alt-ergo with opam
         run: opam exec -- opam reinstall .
 
-      - name: Generate tests
-        run: opam exec -- make gentest
-
       - name: Run tests
         run: opam exec -- make runtest-ci
 

.gitignore

@@ -41,8 +41,5 @@ alt-ergo.js
 alt-ergo-worker.js
 www/
 
-# Generated dune files by gentest
-tests/*/**/dune
-
 # Generated nix files
 /result*

Makefile

@@ -118,7 +118,7 @@ packages:
 # Generate new Dune tests from the problems in
 # the directory tests/.
 gentest: $(wildcard tests/**/*)
-	dune exec -- tools/gentest.exe tests/
+	dune build @tests/gentest --auto-promote
 
 # Run non-regression tests.
 runtest: gentest bin

tests/dune

@@ -1,3 +1,26 @@
 (cram
  (package alt-ergo)
  (deps %{bin:alt-ergo}))
+
+(include dune.inc)
+
+(rule
+ (deps (file ../tools/gentest.exe) (source_tree .))
+ (action
+  (with-stdout-to dune.inc.gen (run ../tools/gentest.exe .))))
+
+(rule
+ (alias gentest)
+ (action (diff dune.inc dune.inc.gen)))
+
+(rule
+ (alias runtest)
+ (action (diff dune.inc dune.inc.gen)))
+
+(rule
+ (alias runtest-quick)
+ (action (diff dune.inc dune.inc.gen)))
+
+(rule
+ (alias runtest-ci)
+ (action (diff dune.inc dune.inc.gen)))