From 6b46bb58cdec8f16806f7907875ef76b259092bf Mon Sep 17 00:00:00 2001 From: Andre Maroneze <andre.maroneze@cea.fr> Date: Fri, 24 Jan 2025 11:33:29 +0100 Subject: [PATCH] [Dev] add Cram tests to 'make default-tests' and generalize nix cram testing --- nix/kernel-tests.nix | 5 +---- nix/plugins-tests.nix | 2 ++ share/Makefile.testing | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/kernel-tests.nix b/nix/kernel-tests.nix index 6c2d9d51d61..6cea52f1138 100644 --- a/nix/kernel-tests.nix +++ b/nix/kernel-tests.nix @@ -16,10 +16,7 @@ mk_tests { @tests/syntax/ptests \ @src/kernel_internals/parsing/tests/ptests dune runtest -j1 --display short \ - src/plugins/server/tests/batch \ - tests/fc_script \ - tests/misc \ - tests/syntax + tests make -C share/machdeps check-schema ''; } diff --git a/nix/plugins-tests.nix b/nix/plugins-tests.nix index b6a83abadd1..1979e3b424c 100644 --- a/nix/plugins-tests.nix +++ b/nix/plugins-tests.nix @@ -27,6 +27,8 @@ mk_tests { @src/plugins/region/tests/ptests \ @src/plugins/server/tests/ptests \ @src/plugins/variadic/tests/ptests + dune runtest -j1 --display short \ + src/plugins/server ''; has-wp-proofs = true ; } diff --git a/share/Makefile.testing b/share/Makefile.testing index ccad2832680..414ea0ba8b6 100644 --- a/share/Makefile.testing +++ b/share/Makefile.testing @@ -218,6 +218,7 @@ endif # PTEST_USE_WP_CACHE .PHONY: default-tests default-tests: run-ptests dune build @ptests_config + dune runtest tests $(MAKE) count-tests .PHONY: count-tests -- GitLab