make check also runs ARM tests

.gitlab-ci.yml

@@ -186,12 +186,6 @@ check:
   - nix-shell --arg inCI true $EXTRA_NIX_ARGUMENTS --run './compiler/jasminc.native -version'
   - nix-shell --arg inCI true $EXTRA_NIX_ARGUMENTS --run 'make -j$NIX_BUILD_CORES -C compiler check-ci $EXTRA_MAKE_ARGUMENTS'
 
-check-arm-target:
-  extends: check
-  variables:
-    EXTRA_NIX_ARGUMENTS: --arg testDeps true --arg armTestDeps true
-    EXTRA_MAKE_ARGUMENTS: CHECKCATS=arm
-
 libjade-compile-to-asm:
   stage: test
   variables:

compiler/Makefile

@@ -19,7 +19,7 @@ JSJOBS    ?= 2
 CHECKPY   ?=
 CHECK     := $(CHECKPY) scripts/runtest --jobs="$(JSJOBS)"
 CHECK     += config/tests.config
-CHECKCATS ?= all safety CCT nolea print
+CHECKCATS ?= all safety CCT nolea print arm
 
 # --------------------------------------------------------------------
 DESTDIR  ?=

default.nix

@@ -7,7 +7,6 @@
 , devTools ? !inCI
 , ecRef ? ""
 , opamDeps ? false
-, armTestDeps ? false
 , enableFramePointers ? false
 }:
 
@@ -46,14 +45,13 @@ stdenv.mkDerivation {
   src = null;
   buildInputs = []
     ++ optionals coqDeps [ coqPackages.coq coqword ]
-    ++ optionals testDeps ([ curl.bin oP.apron.out ] ++ (with python3Packages; [ python pyyaml ]))
+    ++ optionals testDeps ([ curl.bin oP.apron.out libllvm ] ++ (with python3Packages; [ python pyyaml ]))
     ++ optionals ocamlDeps ([ mpfr ppl ] ++ (with oP; [
          ocaml findlib ocamlbuild
          (batteries.overrideAttrs (o: { doCheck = false; }))
          menhir (oP.menhirLib or null) zarith camlidl apron yojson ]))
     ++ optionals devTools (with oP; [ merlin ])
     ++ optionals ecDeps [ easycrypt easycrypt.runtest alt-ergo z3.out ]
     ++ optionals opamDeps [ rsync git pkg-config perl ppl mpfr opam ]
-    ++ optionals armTestDeps [ libllvm ]
     ;
 }