[ci] Main tests

.gitlab-ci.yml

 stages:
- - git-update
- - build
- - tests
- - distrib_and_compatibility
- - make_public
+  - git-update
+  - build
+  - tests
+  - distrib_and_compatibility
+  - make_public
 
 ################################################################################
 ### VARIABLES (todo)
@@ -20,18 +20,18 @@ stages:
 check-no-old-frama-c:
   stage: git-update
   script:
-   - (! git merge-base --is-ancestor a1e186c68a6418a53b3dc06237f49e8dcbf75f4a HEAD)
-   - git merge-base --is-ancestor a35d2118fe6999dddce9e1847eff626fae9cc37c HEAD
+    - (! git merge-base --is-ancestor a1e186c68a6418a53b3dc06237f49e8dcbf75f4a HEAD)
+    - git merge-base --is-ancestor a35d2118fe6999dddce9e1847eff626fae9cc37c HEAD
   tags:
-   - nix
+    - nix
 
 #avoid a nix error https://github.com/NixOS/nix/issues/2087
 git-update:
   stage: git-update
   script:
-   - nix-instantiate --eval nix/pkgs.nix -A ocamlPackages.frama-c.src.outPath
+    - nix-instantiate --eval nix/pkgs.nix -A ocamlPackages.frama-c.src.outPath
   tags:
-   - nix
+    - nix
 
 ################################################################################
 ### BUILD
@@ -39,7 +39,7 @@ git-update:
 frama-c:
   stage: build
   script:
-   - nix-build nix/pkgs.nix -A ocamlPackages.frama-c
+    - nix-build nix/pkgs.nix -A ocamlPackages.frama-c
   artifacts:
     when: on_failure
     paths:
@@ -47,11 +47,18 @@ frama-c:
       - results.log
     expire_in: 1 day
   tags:
-   - nix
+    - nix
 
 ################################################################################
 ### TESTS
 
+main-tests:
+  stage: tests
+  script:
+    - nix-build nix/pkgs.nix -A ocamlPackages.main-tests
+  tags:
+    - nix
+
 ################################################################################
 ### DISTRIB
 
@@ -66,13 +73,6 @@ frama-c:
 #   tags:
 #    - nix
 
-# tests:
-#   stage: tests
-#   script:
-#    - nix/frama-ci.sh build -A frama-c.tests
-#   tags:
-#    - nix
-
 # wp-qualif:
 #   stage: tests
 #   script:
@@ -186,7 +186,6 @@ frama-c:
 #    - nix/frama-ci.sh build -A frama-c.internal
 #   when: manual
 
-
 # internal_nightly:
 #   <<: *internal_template
 #   script:
@@ -194,7 +193,6 @@ frama-c:
 #   only:
 #   - schedules
 
-
 # .build_template: &frama-c-ocaml
 #   stage: distrib_and_compatibility
 #   script:
@@ -264,35 +262,35 @@ frama-c:
 make_public:
   stage: make_public
   script:
-   - (! git merge-base --is-ancestor a1e186c68a6418a53b3dc06237f49e8dcbf75f4a origin/master)
-   - echo "$FRAMA_C_PUBLIC_SSH_PRIVATE_KEY" | nix run -f channel:nixos-19.03 coreutils --command base64 -d > nix/frama-c-public/id_ed25519
-   - nix run -f channel:nixos-19.03 coreutils --command chmod 400 nix/frama-c-public/id_ed25519
-   - GIT_SSH=nix/frama-c-public/ssh.sh nix run -f channel:nixos-19.03 openssh --command git push git@git.frama-c.com:pub/frama-c.git origin/master:refs/heads/master
+    - (! git merge-base --is-ancestor a1e186c68a6418a53b3dc06237f49e8dcbf75f4a origin/master)
+    - echo "$FRAMA_C_PUBLIC_SSH_PRIVATE_KEY" | nix run -f channel:nixos-19.03 coreutils --command base64 -d > nix/frama-c-public/id_ed25519
+    - nix run -f channel:nixos-19.03 coreutils --command chmod 400 nix/frama-c-public/id_ed25519
+    - GIT_SSH=nix/frama-c-public/ssh.sh nix run -f channel:nixos-19.03 openssh --command git push git@git.frama-c.com:pub/frama-c.git origin/master:refs/heads/master
   tags:
-  - nix
+    - nix
   only:
-  - schedules
+    - schedules
 
 make_public_meta:
   stage: make_public
   script:
-   - echo "$FRAMA_C_PUBLIC_SSH_PRIVATE_KEY" | nix run -f channel:nixos-19.03 coreutils --command base64 -d > nix/frama-c-public/id_ed25519
-   - nix run -f channel:nixos-19.03 coreutils --command chmod 400 nix/frama-c-public/id_ed25519
-   - GIT_SSH=$PWD/nix/frama-c-public/ssh.sh nix run -f channel:nixos-19.03 openssh --command git clone git@git.frama-c.com:frama-c/meta.git nix/frama-c-public/meta
-   - GIT_SSH=$PWD/nix/frama-c-public/ssh.sh nix run -f channel:nixos-19.03 openssh --command git -C nix/frama-c-public/meta push git@git.frama-c.com:pub/meta origin/master:refs/heads/master
+    - echo "$FRAMA_C_PUBLIC_SSH_PRIVATE_KEY" | nix run -f channel:nixos-19.03 coreutils --command base64 -d > nix/frama-c-public/id_ed25519
+    - nix run -f channel:nixos-19.03 coreutils --command chmod 400 nix/frama-c-public/id_ed25519
+    - GIT_SSH=$PWD/nix/frama-c-public/ssh.sh nix run -f channel:nixos-19.03 openssh --command git clone git@git.frama-c.com:frama-c/meta.git nix/frama-c-public/meta
+    - GIT_SSH=$PWD/nix/frama-c-public/ssh.sh nix run -f channel:nixos-19.03 openssh --command git -C nix/frama-c-public/meta push git@git.frama-c.com:pub/meta origin/master:refs/heads/master
   tags:
-  - nix
+    - nix
   only:
-  - schedules
+    - schedules
 
 make_public_fclang:
   stage: make_public
   script:
-   - echo "$FRAMA_C_PUBLIC_SSH_PRIVATE_KEY" | nix run -f channel:nixos-19.03 coreutils --command base64 -d > nix/frama-c-public/id_ed25519
-   - nix run -f channel:nixos-19.03 coreutils --command chmod 400 nix/frama-c-public/id_ed25519
-   - GIT_SSH=$PWD/nix/frama-c-public/ssh.sh nix run -f channel:nixos-19.03 openssh --command git clone git@git.frama-c.com:frama-c/frama-clang.git nix/frama-c-public/frama-clang
-   - GIT_SSH=$PWD/nix/frama-c-public/ssh.sh nix run -f channel:nixos-19.03 openssh --command git -C nix/frama-c-public/frama-clang push git@git.frama-c.com:pub/frama-clang origin/master:refs/heads/master
+    - echo "$FRAMA_C_PUBLIC_SSH_PRIVATE_KEY" | nix run -f channel:nixos-19.03 coreutils --command base64 -d > nix/frama-c-public/id_ed25519
+    - nix run -f channel:nixos-19.03 coreutils --command chmod 400 nix/frama-c-public/id_ed25519
+    - GIT_SSH=$PWD/nix/frama-c-public/ssh.sh nix run -f channel:nixos-19.03 openssh --command git clone git@git.frama-c.com:frama-c/frama-clang.git nix/frama-c-public/frama-clang
+    - GIT_SSH=$PWD/nix/frama-c-public/ssh.sh nix run -f channel:nixos-19.03 openssh --command git -C nix/frama-c-public/frama-clang push git@git.frama-c.com:pub/frama-clang origin/master:refs/heads/master
   tags:
-  - nix
+    - nix
   only:
-  - schedules
+    - schedules

nix/frama-c.nix

@@ -63,6 +63,8 @@ stdenv.mkDerivation rec {
     python3
   ];
 
+  outputs = [ "out" "build_dir" ];
+
   preConfigure = ''
     autoconf
   '';
@@ -71,6 +73,12 @@ stdenv.mkDerivation rec {
     "FRAMAC_INSTALLDIR=$(out)"
   ];
 
+  postInstall = ''
+    mkdir -p $build_dir
+    tar -cf $build_dir/dir.tar .
+    pwd > $build_dir/old_pwd
+  '';
+
   meta = {
     description = "An extensible and collaborative platform dedicated to source-code analysis of C software";
     homepage = "http://frama-c.com/";

nix/main-tests.nix

+{ lib
+, stdenv
+, frama-c
+, perl
+, time
+, which
+}:
+
+stdenv.mkDerivation rec {
+  pname = "main-tests";
+  version = frama-c.version;
+  slang = frama-c.slang;
+
+  build_dir = frama-c.build_dir;
+  src = build_dir + "/dir.tar";
+  sourceRoot = ".";
+
+  buildInputs = frama-c.buildInputs ++ [
+    frama-c
+    perl
+    time
+    which
+  ];
+
+  # Keep main configuration
+  configurePhase = ''
+    true
+  '';
+
+  buildPhase = ''
+    make ptests/ptests.exe
+    make ptests/wtests.exe
+    dune exec --root ptests -- frama-c-ptests tests
+    dune build --display short @tests/ptests
+  '';
+
+  # No installation required
+  installPhase = ''
+    touch $out
+  '';
+}

nix/pkgs.nix

@@ -6,6 +6,7 @@ let
     # Builds
     frama-c = oself.callPackage ./frama-c.nix {};
     # Tests
+    main-tests = oself.callPackage ./main-tests.nix {};
   };
   overlay = self: super: {
     niv = (import sources.niv {}).niv;