[E-ACSL] hopefully lsl-cloud will be happy

src/plugins/e-acsl/Makefile.in

@@ -220,17 +220,10 @@ include $(FRAMAC_SHARE)/Makefile.dynamic
 
 ifeq (@MAY_RUN_TESTS@,yes)
 
-ifeq ($(FRAMAC_INTERNAL),yes)
-E_ACSL_SHARE=-e-acsl-share ./share/e-acsl
-else
-E_ACSL_SHARE=
-endif
-
 $(E_ACSL_DIR)/tests/test_config: $(E_ACSL_DIR)/tests/test_config.in \
 				$(E_ACSL_DIR)/Makefile
 	$(PRINT_MAKING) $@
-	$(SED) -e "s|@SHARE@|$(E_ACSL_SHARE)|g" \
-	       -e "s|@SEDCMD@|`which sed `|g" $< > $@
+	$(SED) -e "s|@SEDCMD@|`which sed `|g" $< > $@
 
 endif
 

src/plugins/e-acsl/pre_visit.ml

@@ -292,7 +292,9 @@ class dup_functions_visitor prj = object (self)
 	-> 
     self#next ();
     let name = "__e_acsl_" ^ vi.vname in
-    let new_vi = Project.on prj (Cil.makeGlobalVar name) vi.vtype in
+    let new_vi = 
+      Project.on prj (Cil.makeGlobalVar ~generated:true name) vi.vtype 
+    in
     Cil_datatype.Varinfo.Hashtbl.add fct_tbl vi new_vi;
     Cil.DoChildrenPost
       (fun l -> match l with

src/plugins/e-acsl/tests/test_config.in

-CMD: @frama-c@ @SHARE@
+CMD: @frama-c@ -e-acsl-share ./share/e-acsl
 OPT: -e-acsl-check -e-acsl-verbose 0
 FILTER:@SEDCMD@ -e "s|[a-zA-Z/\\]\+frama_c_project_e-acsl_[a-z0-9]*|PROJECT_FILE|" -e "s|`readlink -f $FRAMAC_SHARE`|FRAMAC_SHARE|g" -e "s|../../share|FRAMAC_SHARE|g" -e "s|./share/e-acsl|FRAMAC_SHARE/e-acsl|g" -e "s|share/e-acsl|FRAMAC_SHARE/e-acsl|g"
 COMMENT: The last regex works around the tendency of Frama-C to transform