diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e1d60368bb25d8d5c309c757e32945ce632969e..0f5e590aeb0985e584cd853384c17decb8fb9911 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -172,13 +172,6 @@ e-acsl-tests: - ./nix/build-proxy.sh e-acsl-tests <<: *coverage -e-acsl-dev-tests: - stage: tests - script: - - ./nix/build-proxy.sh e-acsl-dev-tests - <<: *coverage - allow_failure: true - .build_template: &eva_template stage: tests script: diff --git a/nix/e-acsl-tests.nix b/nix/e-acsl-tests.nix index 03e5cf1998b039f38b3b1e524252b0ea288ea66a..315808eef5a5c7d1a32091eff635f9f09283e872 100644 --- a/nix/e-acsl-tests.nix +++ b/nix/e-acsl-tests.nix @@ -1,12 +1,9 @@ -{ mk_tests, config } : - -let e-acsl-tests = "e-acsl-tests" + (if config == "" then "" else "-" + config); in -let ptests = "ptests_config" + (if config == "" then "" else "_" + config) ; in -let tests = " @src/plugins/e-acsl/tests/" + ptests ; in +{ mk_tests } : mk_tests { - tests-name = e-acsl-tests ; + tests-name = "e-acsl-tests" ; tests-command = '' dune exec -- frama-c-ptests -never-disabled tests src/plugins/e-acsl/tests - dune build -j1 --display short'' + tests + "\n" ; + dune build -j1 --display short @src/plugins/e-acsl/tests/ptests + ''; } diff --git a/nix/pkgs.nix b/nix/pkgs.nix index 93b33856899aad5efc13e1cdffac5d1357932c00..977fcbd283bc3a0ca1ba4335057263a593613931 100644 --- a/nix/pkgs.nix +++ b/nix/pkgs.nix @@ -34,8 +34,7 @@ let cover = false ; } ; }; - e-acsl-tests = oself.callPackage ./e-acsl-tests.nix { config = ""; }; - e-acsl-dev-tests = oself.callPackage ./e-acsl-tests.nix { config = "dev"; }; + e-acsl-tests = oself.callPackage ./e-acsl-tests.nix {}; eva-default-tests = oself.callPackage ./eva-tests.nix { config = ""; }; eva-apron-tests = oself.callPackage ./eva-tests.nix { config = "apron" ; }; eva-bitwise-tests = oself.callPackage ./eva-tests.nix { config = "bitwise" ; };