diff --git a/nix/default.nix b/nix/default.nix index ebb2af4950210ee6be561bc99feeae4460c36f95..f778a55e4f9313f6a51ceff31ec9dfe8026a4a95 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -180,7 +180,7 @@ rec { e-acsl-tests-dev = stdenv.mkDerivation { name = "frama-c-e-acsl-tests-dev"; - buildInputs = mk_buildInputs {}; + buildInputs = mk_buildInputs { nixPackages = [ pkgs.gmp pkgs.getopt ]; }; build_dir = main.build_dir; src = main.build_dir + "/dir.tar"; sourceRoot = "."; @@ -193,7 +193,8 @@ rec { buildPhase = '' make clean_share_link make create_share_link - make E_ACSL_TESTS -j 4 PTESTS_OPTS="-error-code -j 4" DEV=yes + bin/ptests.opt -error-code -config dev src/plugins/e-acsl/tests/gmp-only/arith.i + bin/ptests.opt -error-code -config dev src/plugins/e-acsl/tests ''; installPhase = '' true @@ -203,7 +204,7 @@ rec { internal = stdenv.mkDerivation { name = "frama-c-internal"; inherit src; - buildInputs = (mk_buildInputs { opamPackages = [ "xml-light" ];} ) ++ + buildInputs = (mk_buildInputs { opamPackages = [ "xml-light" ]; } ) ++ [ pkgs.getopt pkgs.which pkgs.libxslt pkgs.libxml2 pkgs.autoPatchelfHook stdenv.cc.cc.lib ]; diff --git a/src/plugins/e-acsl/tests/gmp-only/test_config_dev b/src/plugins/e-acsl/tests/gmp-only/test_config_dev index ecd7c5b6c1da54a97c9dcaa101e6811d45ebcb2b..f6007192ed0c52d2bdc12f4064d2f72ff177fdfc 100644 --- a/src/plugins/e-acsl/tests/gmp-only/test_config_dev +++ b/src/plugins/e-acsl/tests/gmp-only/test_config_dev @@ -1,4 +1,4 @@ MACRO: DEST @PTEST_RESULT@/gen_@PTEST_NAME@ MACRO: OUT @PTEST_NAME@.res.log MACRO: ERR @PTEST_NAME@.err.log -EXEC: ./scripts/e-acsl-gcc.sh --gmp -I @frama-c@ -q -c -X --frama-c-extra="-journal-disable -verbose 0 -kernel-warn-key *=inactive" -o @DEST@.run.c -O @DEST@.out @PTEST_FILE@ > @PTEST_RESULT@/@OUT@ 2> @PTEST_RESULT@/@ERR@ && ./@DEST@.e-acsl > /dev/null +EXEC: ./scripts/e-acsl-gcc.sh --gmp -I @frama-c@ -c -X --frama-c-extra="-journal-disable -verbose 0 -kernel-warn-key *=inactive" -o @DEST@.run.c -O @DEST@.out @PTEST_FILE@ && ./@DEST@.e-acsl