diff --git a/src/test/compiled.md5sum b/src/test/compiled.md5sum index 20f6dd41f..b5072c7c7 100644 --- a/src/test/compiled.md5sum +++ b/src/test/compiled.md5sum @@ -770,8 +770,6 @@ ac269ce33e9a701493405e639d2f5a4e correct/switch/gcc/switch.gts 792778f0dcf6354ff39cf8ee0a0f2bb0 correct/switch/gcc/switch.relf 17d72c6a7a72b8018879e5c445636de4 correct/syscall/clang/a.out db97697fa77dfd2f129a15c06b9aebc7 correct/syscall/clang_O2/a.out -1d0d20d3ebe7600f619de3032febe92e correct/syscall/clang_O2/syscall.adt -f7bdf574c930ad23d6750de08179986d correct/syscall/clang_O2/syscall.bir f56862bf3e8ccdb223a4754b9dfe5af4 correct/syscall/clang_O2/syscall.gts a086bac2a1d8e547c1cb5a7eeb69c358 correct/syscall/clang_O2/syscall.relf ce1cc85de1f94735a4484434eb043d48 correct/syscall/clang/syscall.adt diff --git a/src/test/compiled.url.txt b/src/test/compiled.url.txt index 9668131d7..055a11083 100644 --- a/src/test/compiled.url.txt +++ b/src/test/compiled.url.txt @@ -1,4 +1,4 @@ -https://files.catbox.moe/1ar17y.zst +https://files.catbox.moe/bz0wwv.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/1ar17y.zst # # make sure to update both URL and sha1sum simultaneously. -f9534fa64a116cf447f985ee14767aa1f41fe6d5 compiled.tar.zst +5103a621a9af5407b149edda077c154a8a4cbd23 compiled.tar.zst diff --git a/src/test/correct/syscall/clang_O2/syscall.md5sum b/src/test/correct/syscall/clang_O2/syscall.md5sum index c0619788a..dfe3413b4 100644 --- a/src/test/correct/syscall/clang_O2/syscall.md5sum +++ b/src/test/correct/syscall/clang_O2/syscall.md5sum @@ -1,5 +1,3 @@ db97697fa77dfd2f129a15c06b9aebc7 correct/syscall/clang_O2/a.out -1d0d20d3ebe7600f619de3032febe92e correct/syscall/clang_O2/syscall.adt -f7bdf574c930ad23d6750de08179986d correct/syscall/clang_O2/syscall.bir a086bac2a1d8e547c1cb5a7eeb69c358 correct/syscall/clang_O2/syscall.relf f56862bf3e8ccdb223a4754b9dfe5af4 correct/syscall/clang_O2/syscall.gts diff --git a/src/test/correct/syscall/config.mk b/src/test/correct/syscall/config.mk index ba94daccb..4f0306b16 100644 --- a/src/test/correct/syscall/config.mk +++ b/src/test/correct/syscall/config.mk @@ -1 +1,4 @@ -ENABLED_COMPILERS = clang clang_O2 gcc gcc_O2 \ No newline at end of file +ENABLED_COMPILERS = clang clang_O2 gcc gcc_O2 + +# disable BAP for clang_O2 +LIFT_ARTEFACTS_clang_O2 = $(COMMON_ARTEFACTS) $(GTIRB_ARTEFACTS) diff --git a/src/test/make/lift-directories.mk b/src/test/make/lift-directories.mk index 785283e8f..1402ef5af 100644 --- a/src/test/make/lift-directories.mk +++ b/src/test/make/lift-directories.mk @@ -2,12 +2,18 @@ # Run from the directory basil/src/test/*/test_case/ +# - lift-directories.mk: sets NAME +# - config.mk: sets ENABLED_COMPILERS +# - exec: gcc_pic.mk: sets CC / CFLAGS +# - lift.mk: sets CONFIG to compiler variant + NAME := $(notdir $(shell pwd)) COMMON_ARTEFACTS := $(NAME).relf BAP_ARTEFACTS := $(NAME).adt $(NAME).bir GTIRB_ARTEFACTS := $(NAME).gts +ALL_ARTEFACTS := $(BAP_ARTEFACTS) $(COMMON_ARTEFACTS) $(GTIRB_ARTEFACTS) # - means continue if it doesnt exist -include ./config.mk diff --git a/src/test/make/lift.mk b/src/test/make/lift.mk index c724c8b4c..e4761a6e9 100644 --- a/src/test/make/lift.mk +++ b/src/test/make/lift.mk @@ -3,6 +3,16 @@ MD5SUM_FILE := $(NAME).md5sum +# compilation variant name. be careful of trailing whitespace! +CONFIG := $(notdir $(realpath .)) + +# override with config-specific lifter selection +ifdef LIFT_ARTEFACTS_$(CONFIG) + LIFT_ARTEFACTS := $(LIFT_ARTEFACTS_$(CONFIG)) +endif + +# $(info $(realpath .) config=$(CONFIG) artefacts=$(LIFT_ARTEFACTS)) + all: $(LIFT_ARTEFACTS) $(NAME).relf: a.out