support configuring LIFT_ARTEFACTS in config.mk and remove spurious B…

…AP tests namely, SystemTestsBAP correct/functionpointer/gcc_O2:BAP SystemTestsBAP correct/functionpointer/gcc:BAP SystemTestsBAP correct/functionpointer/clang:BAP SystemTestsBAP correct/functionpointer/gcc_pic:BAP SystemTestsBAP correct/functionpointer/clang_pic:BAP SystemTestsBAP correct/indirect_call/gcc:BAP SystemTestsBAP correct/indirect_call/clang:BAP SystemTestsBAP correct/indirect_call/gcc_pic:BAP SystemTestsBAP correct/indirect_call/clang_pic:BAP SystemTestsBAP correct/jumptable2/gcc_O2:BAP SystemTestsBAP correct/jumptable2/clang_O2:BAP SystemTestsBAP correct/jumptable2/gcc:BAP SystemTestsBAP correct/jumptable2/clang:BAP SystemTestsBAP correct/jumptable2/gcc_pic:BAP SystemTestsBAP correct/jumptable2/clang_pic:BAP
UQ-PAC · Dec 17, 2024 · fa740ff · fa740ff
1 parent dedc39b
commit fa740ff
Show file tree

Hide file tree

Showing 21 changed files with 19 additions and 68 deletions.
diff --git a/src/test/compiled.md5sum b/src/test/compiled.md5sum
diff --git a/src/test/compiled.url.txt b/src/test/compiled.url.txt
@@ -1,4 +1,4 @@
-https://files.catbox.moe/p9oa64.zst
+https://files.catbox.moe/4ne2m1.zst
 
 # this file should have a URL as its first line
 # and a sha1sum as its last line. all other
@@ -9,4 +9,4 @@ https://files.catbox.moe/p9oa64.zst
 # 
 # make sure to update both URL and sha1sum simultaneously.
 
-f33858749f1b7898dfb074d4ccd5212cb5c1780b  compiled.tar.zst
+9bae8d55898d6715b27323de74954086de86d2cc  compiled.tar.zst
diff --git a/src/test/correct/functionpointer/clang/md5sums b/src/test/correct/functionpointer/clang/md5sums
diff --git a/src/test/correct/functionpointer/clang_pic/md5sums b/src/test/correct/functionpointer/clang_pic/md5sums
diff --git a/src/test/correct/functionpointer/config.mk b/src/test/correct/functionpointer/config.mk
@@ -1 +1,3 @@
-ENABLED_COMPILERS = clang clang_pic gcc gcc_O2 gcc_pic
+ENABLED_COMPILERS = clang clang_pic gcc gcc_O2 gcc_pic
+
+LIFT_ARTEFACTS := $(COMMON_ARTEFACTS) $(GTIRB_ARTEFACTS)
diff --git a/src/test/correct/functionpointer/gcc/md5sums b/src/test/correct/functionpointer/gcc/md5sums
diff --git a/src/test/correct/functionpointer/gcc_O2/md5sums b/src/test/correct/functionpointer/gcc_O2/md5sums
diff --git a/src/test/correct/functionpointer/gcc_pic/md5sums b/src/test/correct/functionpointer/gcc_pic/md5sums
diff --git a/src/test/correct/indirect_call/clang/md5sums b/src/test/correct/indirect_call/clang/md5sums
diff --git a/src/test/correct/indirect_call/clang_pic/md5sums b/src/test/correct/indirect_call/clang_pic/md5sums
diff --git a/src/test/correct/indirect_call/config.mk b/src/test/correct/indirect_call/config.mk
@@ -1 +1,3 @@
-ENABLED_COMPILERS = clang clang_pic gcc gcc_pic
+ENABLED_COMPILERS = clang clang_pic gcc gcc_pic
+
+LIFT_ARTEFACTS := $(COMMON_ARTEFACTS) $(GTIRB_ARTEFACTS)
diff --git a/src/test/correct/indirect_call/gcc/md5sums b/src/test/correct/indirect_call/gcc/md5sums
diff --git a/src/test/correct/indirect_call/gcc_pic/md5sums b/src/test/correct/indirect_call/gcc_pic/md5sums
diff --git a/src/test/correct/jumptable2/clang/md5sums b/src/test/correct/jumptable2/clang/md5sums
diff --git a/src/test/correct/jumptable2/clang_O2/md5sums b/src/test/correct/jumptable2/clang_O2/md5sums
diff --git a/src/test/correct/jumptable2/clang_pic/md5sums b/src/test/correct/jumptable2/clang_pic/md5sums
diff --git a/src/test/correct/jumptable2/config.mk b/src/test/correct/jumptable2/config.mk
@@ -1 +1,3 @@
-ENABLED_COMPILERS = clang clang_O2 clang_pic gcc gcc_O2 gcc_pic
+ENABLED_COMPILERS = clang clang_O2 clang_pic gcc gcc_O2 gcc_pic
+
+LIFT_ARTEFACTS := $(COMMON_ARTEFACTS) $(GTIRB_ARTEFACTS)
diff --git a/src/test/correct/jumptable2/gcc/md5sums b/src/test/correct/jumptable2/gcc/md5sums
diff --git a/src/test/correct/jumptable2/gcc_O2/md5sums b/src/test/correct/jumptable2/gcc_O2/md5sums
diff --git a/src/test/correct/jumptable2/gcc_pic/md5sums b/src/test/correct/jumptable2/gcc_pic/md5sums
diff --git a/src/test/make/lift-directories.mk b/src/test/make/lift-directories.mk
@@ -2,10 +2,17 @@
 
 # Run from the directory basil/src/test/*/test_case/
 
+NAME := $(notdir $(shell pwd))
+
+COMMON_ARTEFACTS := $(NAME).relf
+BAP_ARTEFACTS := $(NAME).adt $(NAME).bir
+GTIRB_ARTEFACTS := $(NAME).gts
+
 # - means continue if it doesnt exist
 -include ./config.mk
 
-NAME=$(notdir $(shell pwd))
+LIFT_ARTEFACTS ?= $(BAP_ARTEFACTS) $(COMMON_ARTEFACTS) $(GTIRB_ARTEFACTS)
+
 GIT_ROOT?=$(realpath ../../../../)
 BUILD_DIR ?= $(shell realpath --relative-to $(GIT_ROOT) .)
 MAKE_DIR ?= $(GIT_ROOT)/src/test/make
@@ -36,8 +43,6 @@ BASIL_FLAGS ?=
 #BOOGIE_FLAGS=/proverOpt:O:smt.array.extensional=false
 BOOGIE_FLAGS ?= /useArrayAxioms
 
-LIFT_ARTEFACTS=$(NAME).adt $(NAME).bir $(NAME).relf $(NAME).gts
-
 ENABLED_COMPILERS ?= clang clang_O2 clang_pic gcc gcc_O2 gcc_pic
 
 TARGETS := all verify repro-stash repro-check md5sum-check md5sum-update clean cleanall cleanlift cleanjson cleangts cleantest recompile json gts