Merge branch 'feature/makefile-tests' into 'master'

[Makefile] Precise flags for test module compilation

Needed for changes introduced by frama-c/frama-c!930

See merge request !69

src/plugins/e-acsl/.gitlab-ci.yml

 Tests:
   script:
-  - ~oci/oci/bin/bf_client.native run --socket ~oci/data/oci-data/oci.socket --rootfs 1 --frama-c master --E-ACSL $(git rev-parse HEAD) E-ACSL
+  - ~oci/oci/bin/bf_client.native run --socket ~oci/data/oci-data/oci.socket --rootfs 1 --E-ACSL $CI_BUILD_REF --branch $CI_BUILD_REF_NAME E-ACSL
   tags:
   except:
   - tags

src/plugins/e-acsl/Makefile.in

@@ -112,11 +112,16 @@ $(PLUGIN_DIR)/local_config.ml: $(PLUGIN_DIR)/Makefile.in VERSION
 
 ifeq (@MAY_RUN_TESTS@,yes)
 
-$(PLUGIN_DIR)/tests/print.cmxs: OFLAGS=-I $(FRAMAC_LIB)
-$(PLUGIN_DIR)/tests/print.cmo: BFLAGS=-I $(FRAMAC_LIB)
+$(PLUGIN_DIR)/tests/print.cmxs: OFLAGS=-I $(FRAMAC_LIB) -I tests
+$(PLUGIN_DIR)/tests/print.cmo: BFLAGS=-I $(FRAMAC_LIB) -I tests
+$(PLUGIN_DIR)/tests/print.cmx: OFLAGS=-I $(FRAMAC_LIB) -I tests
 
 PLUGIN_TESTS_DIRS := reject runtime bts gmp no-main
-E_ACSL_TESTS: $(PLUGIN_DIR)/tests/test_config \
+PLUGIN_TESTS_LIB:=tests/print.ml
+
+E_ACSL_TESTS: $(PLUGIN_DIR)/tests/test_config
+
+$(PLUGIN_DIR)/tests/ptests_config: \
 	$(PLUGIN_DIR)/tests/print.cmxs \
 	$(PLUGIN_DIR)/tests/print.cmo
 

src/plugins/e-acsl/tests/print.ml

@@ -3,7 +3,7 @@ module Printer_extension(X:Printer.PrinterClass) = struct
   class printer = object
     inherit Printer.extensible_printer () as super
 
-    method global fmt g =
+    method! global fmt g =
       let loc, _ = Cil_datatype.Global.loc g in
       let file = loc.Lexing.pos_fname in
       if file = "" || List.exists