From fa740ff8175709aed47be26ccadad74cd62136e2 Mon Sep 17 00:00:00 2001 From: rina Date: Tue, 17 Dec 2024 11:40:16 +1000 Subject: [PATCH] support configuring LIFT_ARTEFACTS in config.mk and remove spurious BAP 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 --- src/test/compiled.md5sum | 30 ------------------- src/test/compiled.url.txt | 4 +-- .../correct/functionpointer/clang/md5sums | 2 -- .../correct/functionpointer/clang_pic/md5sums | 2 -- src/test/correct/functionpointer/config.mk | 4 ++- src/test/correct/functionpointer/gcc/md5sums | 2 -- .../correct/functionpointer/gcc_O2/md5sums | 2 -- .../correct/functionpointer/gcc_pic/md5sums | 2 -- src/test/correct/indirect_call/clang/md5sums | 2 -- .../correct/indirect_call/clang_pic/md5sums | 2 -- src/test/correct/indirect_call/config.mk | 4 ++- src/test/correct/indirect_call/gcc/md5sums | 2 -- .../correct/indirect_call/gcc_pic/md5sums | 2 -- src/test/correct/jumptable2/clang/md5sums | 2 -- src/test/correct/jumptable2/clang_O2/md5sums | 2 -- src/test/correct/jumptable2/clang_pic/md5sums | 2 -- src/test/correct/jumptable2/config.mk | 4 ++- src/test/correct/jumptable2/gcc/md5sums | 2 -- src/test/correct/jumptable2/gcc_O2/md5sums | 2 -- src/test/correct/jumptable2/gcc_pic/md5sums | 2 -- src/test/make/lift-directories.mk | 11 +++++-- 21 files changed, 19 insertions(+), 68 deletions(-) diff --git a/src/test/compiled.md5sum b/src/test/compiled.md5sum index fd3cb4aff..3e9300a1f 100644 --- a/src/test/compiled.md5sum +++ b/src/test/compiled.md5sum @@ -479,28 +479,18 @@ ce9873a07a3420f0d51c65b0b9355189 correct/function/gcc_pic/function.bir 65e8f84eae2098bd323bd4e20f9d9d96 correct/function/gcc_pic/function.gts 027a940e4289a98cb4888ab4dfb0304a correct/function/gcc_pic/function.relf ed01799590caf4000f3757aaa0fe82b5 correct/functionpointer/clang/a.out -4c38f1a5d2769b78dab61eb4ad6b901a correct/functionpointer/clang/functionpointer.adt -1998c00626050048fd487d6320965b20 correct/functionpointer/clang/functionpointer.bir 2407bf6134eb2d1d76898a6015b4d962 correct/functionpointer/clang/functionpointer.gts d5676e59fd1be2cdb13ebe695256929a correct/functionpointer/clang/functionpointer.relf 88b5b2666238da7615590e7c3d02e66b correct/functionpointer/clang_pic/a.out -d11765657286c693e5264d7a6a9b6e2a correct/functionpointer/clang_pic/functionpointer.adt -66151171ae2b5a71778da32d327ef54a correct/functionpointer/clang_pic/functionpointer.bir f6879418d1f319694687bc68020a901d correct/functionpointer/clang_pic/functionpointer.gts e299e7da5f7e340601033ddfb996cf35 correct/functionpointer/clang_pic/functionpointer.relf d3fd0ce466066426ea63666074bcbcb0 correct/functionpointer/gcc/a.out -2771c1e656764a391c502fc7cecf66cf correct/functionpointer/gcc/functionpointer.adt -5047df447e76c6edfafad8d27fda5f6e correct/functionpointer/gcc/functionpointer.bir d681467cbbc950024ee015777e595e50 correct/functionpointer/gcc/functionpointer.gts 69789da9dd26fc97658df9db86b61750 correct/functionpointer/gcc/functionpointer.relf 4543ced5b06d8b650b3dc778cb143f33 correct/functionpointer/gcc_O2/a.out -d4d90be8a88584d99e0a02555ec96948 correct/functionpointer/gcc_O2/functionpointer.adt -a5c93373744a4532082cfa0cfcf848ad correct/functionpointer/gcc_O2/functionpointer.bir f86fd512f815964c7da8a0c4b1f5de1c correct/functionpointer/gcc_O2/functionpointer.gts 42e13cace40a6761d17796c85305dd1e correct/functionpointer/gcc_O2/functionpointer.relf adc85bb75e82a9893f72b5647efb7a00 correct/functionpointer/gcc_pic/a.out -ff7a4bda2f7513120345d1bb44e3b96e correct/functionpointer/gcc_pic/functionpointer.adt -f76a336ae68154f638da7776ba34526a correct/functionpointer/gcc_pic/functionpointer.bir 46f0cbbf491599364d4a33d92381abcb correct/functionpointer/gcc_pic/functionpointer.gts 6db1a3d861c32687205eeff92e4edd2b correct/functionpointer/gcc_pic/functionpointer.relf 601bbbfa57a2bfe69d9fe121f34c6089 correct/functions_with_params/clang/a.out @@ -564,23 +554,15 @@ ed4680b1fe5d1d91b41ec36f7e1b57e4 correct/ifglobal/gcc_pic/ifglobal.adt 23ef9b4a87928125fc20f3f204609ef0 correct/ifglobal/gcc_pic/ifglobal.gts d62c8a765845d84c644d4f556e9d4f33 correct/ifglobal/gcc_pic/ifglobal.relf 8aa515ab6c2878e2ddb872cc2d4fb68a correct/indirect_call/clang/a.out -dfa613068412772e97fd32b13e9b937a correct/indirect_call/clang/indirect_call.adt -1cf95cd31a2727a2c01f2cb39645ea7a correct/indirect_call/clang/indirect_call.bir 15900904642d9aa5774ef2a41552b106 correct/indirect_call/clang/indirect_call.gts 2686fc6b5b2ce84a8fa43d98a198ee7b correct/indirect_call/clang/indirect_call.relf 8d9935869b1ed092b02abe7705ebcf21 correct/indirect_call/clang_pic/a.out -09687a382887fee02d4ff4f88867d299 correct/indirect_call/clang_pic/indirect_call.adt -fd637cd45d0255aa25bb50d87d7f04a5 correct/indirect_call/clang_pic/indirect_call.bir bf4e0973cfce72a447e320c5af3ca741 correct/indirect_call/clang_pic/indirect_call.gts e8d85c551cf2db297609279374c5ffdc correct/indirect_call/clang_pic/indirect_call.relf 4f6caa66e2e3e131aff7ac3e0c4e5d77 correct/indirect_call/gcc/a.out -8296fd9bd387e05b9c52c50462cb6b97 correct/indirect_call/gcc/indirect_call.adt -441e1c62e63abf6d347ac79e556247ca correct/indirect_call/gcc/indirect_call.bir 9b5530e8fd27e819ebfc9a844c58a4f5 correct/indirect_call/gcc/indirect_call.gts de98122db349f10a47de9c5e4777d8e7 correct/indirect_call/gcc/indirect_call.relf 692a0be496e9a1714271968a1e8d0232 correct/indirect_call/gcc_pic/a.out -2cf7d626149d75fd6f94a782aed84d25 correct/indirect_call/gcc_pic/indirect_call.adt -64748e5bcd57ac7d2ae65c7906d8f1b2 correct/indirect_call/gcc_pic/indirect_call.bir b35b54f5d395f595fdf666c3f5c7d731 correct/indirect_call/gcc_pic/indirect_call.gts ade7607337aba61321d732de7d89c7f6 correct/indirect_call/gcc_pic/indirect_call.relf 600cc5e506c0095bcd43eb309936e2f2 correct/initialisation/clang/a.out @@ -614,33 +596,21 @@ e40efe06bb66bb999f7c079edb8d8122 correct/initialisation/gcc_pic/initialisation. 4007260caacde4d306b19d9e86dd6d7a correct/initialisation/gcc_pic/initialisation.gts 8389fc6ef2d773f91fdf9cf510ca3c5f correct/initialisation/gcc_pic/initialisation.relf 350b8a7223a87ae1164255faac8bf989 correct/jumptable2/clang/a.out -5b977e790eefd1668b82168d7f870662 correct/jumptable2/clang/jumptable2.adt -e09195e63d04d5b609b2bd34c0d3795f correct/jumptable2/clang/jumptable2.bir a6c262573840e36b2559daa850c99bb6 correct/jumptable2/clang/jumptable2.gts dfe5e4f47c5b4718a7023e51847e4977 correct/jumptable2/clang/jumptable2.relf 02ec42ed15d9baaa1a2ff92dee36a538 correct/jumptable2/clang_O2/a.out -0aea6dee410ff85dc395914006310c1e correct/jumptable2/clang_O2/jumptable2.adt -eafbe88d8b44824b555c424d87eab28f correct/jumptable2/clang_O2/jumptable2.bir d8c57b1b56b77d5c09969fab704363f7 correct/jumptable2/clang_O2/jumptable2.gts 312fb212e966185dc2eac4a2a5e1c5e9 correct/jumptable2/clang_O2/jumptable2.relf b2215402427c40ccd1d5846c2da9c17b correct/jumptable2/clang_pic/a.out -7840fa8b2c03aae7d6804f0a6f85a33a correct/jumptable2/clang_pic/jumptable2.adt -c46b489f19faafc4277f81ebea2cf3b2 correct/jumptable2/clang_pic/jumptable2.bir f6877a96c93eccaf70cc2d0eac393f03 correct/jumptable2/clang_pic/jumptable2.gts 38d562bbf629d2cc2a2e656c8822c835 correct/jumptable2/clang_pic/jumptable2.relf 37f77cb80e1cb81e2098a1873107989b correct/jumptable2/gcc/a.out -5eddd4883dc8e80e649b3b59e3ab70dc correct/jumptable2/gcc/jumptable2.adt -531fd7be86c58a8f8c392ac69982cf84 correct/jumptable2/gcc/jumptable2.bir c972a9193d6ebb964fc959477cd6bacb correct/jumptable2/gcc/jumptable2.gts 73d67997598e19044edc3b878f89b471 correct/jumptable2/gcc/jumptable2.relf 35dee69068b64fcf296381141511140e correct/jumptable2/gcc_O2/a.out -28fbb4a35b29233d65484d977c56a495 correct/jumptable2/gcc_O2/jumptable2.adt -daf88bb18b74f7f3eb7210dce4c58ba1 correct/jumptable2/gcc_O2/jumptable2.bir 6c3ba6c2d2f52bf4a4a9febfb9264671 correct/jumptable2/gcc_O2/jumptable2.gts db7967b2d3f16668d93b8ba9a021e46c correct/jumptable2/gcc_O2/jumptable2.relf 8ddcf327f34a9a08d802d11ad4662fa4 correct/jumptable2/gcc_pic/a.out -76bb2cc11e5d83b3dcb3c9cdae069695 correct/jumptable2/gcc_pic/jumptable2.adt -882932072c55e58647631354a5fc2db0 correct/jumptable2/gcc_pic/jumptable2.bir bac9369d8ce76e145e4d169e85d8b3e3 correct/jumptable2/gcc_pic/jumptable2.gts 6cae7faa1ec96164ee34b07cb82297a8 correct/jumptable2/gcc_pic/jumptable2.relf 4485f1bdb66b497f11a7e45176e7e205 correct/malloc_with_local2/clang/a.out diff --git a/src/test/compiled.url.txt b/src/test/compiled.url.txt index 5a02303ec..53c6ed35a 100644 --- 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 index a9672ce0a..eddb6c696 100644 --- a/src/test/correct/functionpointer/clang/md5sums +++ b/src/test/correct/functionpointer/clang/md5sums @@ -1,5 +1,3 @@ ed01799590caf4000f3757aaa0fe82b5 correct/functionpointer/clang/a.out -4c38f1a5d2769b78dab61eb4ad6b901a correct/functionpointer/clang/functionpointer.adt -1998c00626050048fd487d6320965b20 correct/functionpointer/clang/functionpointer.bir d5676e59fd1be2cdb13ebe695256929a correct/functionpointer/clang/functionpointer.relf 2407bf6134eb2d1d76898a6015b4d962 correct/functionpointer/clang/functionpointer.gts diff --git a/src/test/correct/functionpointer/clang_pic/md5sums b/src/test/correct/functionpointer/clang_pic/md5sums index c6fb733cd..949c8e4fa 100644 --- a/src/test/correct/functionpointer/clang_pic/md5sums +++ b/src/test/correct/functionpointer/clang_pic/md5sums @@ -1,5 +1,3 @@ 88b5b2666238da7615590e7c3d02e66b correct/functionpointer/clang_pic/a.out -d11765657286c693e5264d7a6a9b6e2a correct/functionpointer/clang_pic/functionpointer.adt -66151171ae2b5a71778da32d327ef54a correct/functionpointer/clang_pic/functionpointer.bir e299e7da5f7e340601033ddfb996cf35 correct/functionpointer/clang_pic/functionpointer.relf f6879418d1f319694687bc68020a901d correct/functionpointer/clang_pic/functionpointer.gts diff --git a/src/test/correct/functionpointer/config.mk b/src/test/correct/functionpointer/config.mk index 2d9f2c599..f830bae2e 100644 --- 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 \ No newline at end of file +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 index 99bd1bd07..67de7b7d5 100644 --- a/src/test/correct/functionpointer/gcc/md5sums +++ b/src/test/correct/functionpointer/gcc/md5sums @@ -1,5 +1,3 @@ d3fd0ce466066426ea63666074bcbcb0 correct/functionpointer/gcc/a.out -2771c1e656764a391c502fc7cecf66cf correct/functionpointer/gcc/functionpointer.adt -5047df447e76c6edfafad8d27fda5f6e correct/functionpointer/gcc/functionpointer.bir 69789da9dd26fc97658df9db86b61750 correct/functionpointer/gcc/functionpointer.relf d681467cbbc950024ee015777e595e50 correct/functionpointer/gcc/functionpointer.gts diff --git a/src/test/correct/functionpointer/gcc_O2/md5sums b/src/test/correct/functionpointer/gcc_O2/md5sums index f9a5f98ce..92a62752c 100644 --- a/src/test/correct/functionpointer/gcc_O2/md5sums +++ b/src/test/correct/functionpointer/gcc_O2/md5sums @@ -1,5 +1,3 @@ 4543ced5b06d8b650b3dc778cb143f33 correct/functionpointer/gcc_O2/a.out -d4d90be8a88584d99e0a02555ec96948 correct/functionpointer/gcc_O2/functionpointer.adt -a5c93373744a4532082cfa0cfcf848ad correct/functionpointer/gcc_O2/functionpointer.bir 42e13cace40a6761d17796c85305dd1e correct/functionpointer/gcc_O2/functionpointer.relf f86fd512f815964c7da8a0c4b1f5de1c correct/functionpointer/gcc_O2/functionpointer.gts diff --git a/src/test/correct/functionpointer/gcc_pic/md5sums b/src/test/correct/functionpointer/gcc_pic/md5sums index 41e682e3a..0b2562953 100644 --- a/src/test/correct/functionpointer/gcc_pic/md5sums +++ b/src/test/correct/functionpointer/gcc_pic/md5sums @@ -1,5 +1,3 @@ adc85bb75e82a9893f72b5647efb7a00 correct/functionpointer/gcc_pic/a.out -ff7a4bda2f7513120345d1bb44e3b96e correct/functionpointer/gcc_pic/functionpointer.adt -f76a336ae68154f638da7776ba34526a correct/functionpointer/gcc_pic/functionpointer.bir 6db1a3d861c32687205eeff92e4edd2b correct/functionpointer/gcc_pic/functionpointer.relf 46f0cbbf491599364d4a33d92381abcb correct/functionpointer/gcc_pic/functionpointer.gts diff --git a/src/test/correct/indirect_call/clang/md5sums b/src/test/correct/indirect_call/clang/md5sums index e78e1af9b..092a44111 100644 --- a/src/test/correct/indirect_call/clang/md5sums +++ b/src/test/correct/indirect_call/clang/md5sums @@ -1,5 +1,3 @@ 8aa515ab6c2878e2ddb872cc2d4fb68a correct/indirect_call/clang/a.out -dfa613068412772e97fd32b13e9b937a correct/indirect_call/clang/indirect_call.adt -1cf95cd31a2727a2c01f2cb39645ea7a correct/indirect_call/clang/indirect_call.bir 2686fc6b5b2ce84a8fa43d98a198ee7b correct/indirect_call/clang/indirect_call.relf 15900904642d9aa5774ef2a41552b106 correct/indirect_call/clang/indirect_call.gts diff --git a/src/test/correct/indirect_call/clang_pic/md5sums b/src/test/correct/indirect_call/clang_pic/md5sums index f81ce4695..dd9e874f0 100644 --- a/src/test/correct/indirect_call/clang_pic/md5sums +++ b/src/test/correct/indirect_call/clang_pic/md5sums @@ -1,5 +1,3 @@ 8d9935869b1ed092b02abe7705ebcf21 correct/indirect_call/clang_pic/a.out -09687a382887fee02d4ff4f88867d299 correct/indirect_call/clang_pic/indirect_call.adt -fd637cd45d0255aa25bb50d87d7f04a5 correct/indirect_call/clang_pic/indirect_call.bir e8d85c551cf2db297609279374c5ffdc correct/indirect_call/clang_pic/indirect_call.relf bf4e0973cfce72a447e320c5af3ca741 correct/indirect_call/clang_pic/indirect_call.gts diff --git a/src/test/correct/indirect_call/config.mk b/src/test/correct/indirect_call/config.mk index ea9b72ce9..4123ae71c 100644 --- 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 \ No newline at end of file +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 index 0c9c78894..13e250adf 100644 --- a/src/test/correct/indirect_call/gcc/md5sums +++ b/src/test/correct/indirect_call/gcc/md5sums @@ -1,5 +1,3 @@ 4f6caa66e2e3e131aff7ac3e0c4e5d77 correct/indirect_call/gcc/a.out -8296fd9bd387e05b9c52c50462cb6b97 correct/indirect_call/gcc/indirect_call.adt -441e1c62e63abf6d347ac79e556247ca correct/indirect_call/gcc/indirect_call.bir de98122db349f10a47de9c5e4777d8e7 correct/indirect_call/gcc/indirect_call.relf 9b5530e8fd27e819ebfc9a844c58a4f5 correct/indirect_call/gcc/indirect_call.gts diff --git a/src/test/correct/indirect_call/gcc_pic/md5sums b/src/test/correct/indirect_call/gcc_pic/md5sums index 92b2ed071..7da7e5078 100644 --- a/src/test/correct/indirect_call/gcc_pic/md5sums +++ b/src/test/correct/indirect_call/gcc_pic/md5sums @@ -1,5 +1,3 @@ 692a0be496e9a1714271968a1e8d0232 correct/indirect_call/gcc_pic/a.out -2cf7d626149d75fd6f94a782aed84d25 correct/indirect_call/gcc_pic/indirect_call.adt -64748e5bcd57ac7d2ae65c7906d8f1b2 correct/indirect_call/gcc_pic/indirect_call.bir ade7607337aba61321d732de7d89c7f6 correct/indirect_call/gcc_pic/indirect_call.relf b35b54f5d395f595fdf666c3f5c7d731 correct/indirect_call/gcc_pic/indirect_call.gts diff --git a/src/test/correct/jumptable2/clang/md5sums b/src/test/correct/jumptable2/clang/md5sums index b9e671623..57ac4d9ec 100644 --- a/src/test/correct/jumptable2/clang/md5sums +++ b/src/test/correct/jumptable2/clang/md5sums @@ -1,5 +1,3 @@ 350b8a7223a87ae1164255faac8bf989 correct/jumptable2/clang/a.out -5b977e790eefd1668b82168d7f870662 correct/jumptable2/clang/jumptable2.adt -e09195e63d04d5b609b2bd34c0d3795f correct/jumptable2/clang/jumptable2.bir dfe5e4f47c5b4718a7023e51847e4977 correct/jumptable2/clang/jumptable2.relf a6c262573840e36b2559daa850c99bb6 correct/jumptable2/clang/jumptable2.gts diff --git a/src/test/correct/jumptable2/clang_O2/md5sums b/src/test/correct/jumptable2/clang_O2/md5sums index 1bd4b65f3..e6c68f9a1 100644 --- a/src/test/correct/jumptable2/clang_O2/md5sums +++ b/src/test/correct/jumptable2/clang_O2/md5sums @@ -1,5 +1,3 @@ 02ec42ed15d9baaa1a2ff92dee36a538 correct/jumptable2/clang_O2/a.out -0aea6dee410ff85dc395914006310c1e correct/jumptable2/clang_O2/jumptable2.adt -eafbe88d8b44824b555c424d87eab28f correct/jumptable2/clang_O2/jumptable2.bir 312fb212e966185dc2eac4a2a5e1c5e9 correct/jumptable2/clang_O2/jumptable2.relf d8c57b1b56b77d5c09969fab704363f7 correct/jumptable2/clang_O2/jumptable2.gts diff --git a/src/test/correct/jumptable2/clang_pic/md5sums b/src/test/correct/jumptable2/clang_pic/md5sums index 194a077dd..e8043e485 100644 --- a/src/test/correct/jumptable2/clang_pic/md5sums +++ b/src/test/correct/jumptable2/clang_pic/md5sums @@ -1,5 +1,3 @@ b2215402427c40ccd1d5846c2da9c17b correct/jumptable2/clang_pic/a.out -7840fa8b2c03aae7d6804f0a6f85a33a correct/jumptable2/clang_pic/jumptable2.adt -c46b489f19faafc4277f81ebea2cf3b2 correct/jumptable2/clang_pic/jumptable2.bir 38d562bbf629d2cc2a2e656c8822c835 correct/jumptable2/clang_pic/jumptable2.relf f6877a96c93eccaf70cc2d0eac393f03 correct/jumptable2/clang_pic/jumptable2.gts diff --git a/src/test/correct/jumptable2/config.mk b/src/test/correct/jumptable2/config.mk index 2622f3baa..ff3f41faa 100644 --- 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 \ No newline at end of file +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 index 259e24fd4..edadc83ea 100644 --- a/src/test/correct/jumptable2/gcc/md5sums +++ b/src/test/correct/jumptable2/gcc/md5sums @@ -1,5 +1,3 @@ 37f77cb80e1cb81e2098a1873107989b correct/jumptable2/gcc/a.out -5eddd4883dc8e80e649b3b59e3ab70dc correct/jumptable2/gcc/jumptable2.adt -531fd7be86c58a8f8c392ac69982cf84 correct/jumptable2/gcc/jumptable2.bir 73d67997598e19044edc3b878f89b471 correct/jumptable2/gcc/jumptable2.relf c972a9193d6ebb964fc959477cd6bacb correct/jumptable2/gcc/jumptable2.gts diff --git a/src/test/correct/jumptable2/gcc_O2/md5sums b/src/test/correct/jumptable2/gcc_O2/md5sums index 8764c94e2..8ebe09593 100644 --- a/src/test/correct/jumptable2/gcc_O2/md5sums +++ b/src/test/correct/jumptable2/gcc_O2/md5sums @@ -1,5 +1,3 @@ 35dee69068b64fcf296381141511140e correct/jumptable2/gcc_O2/a.out -28fbb4a35b29233d65484d977c56a495 correct/jumptable2/gcc_O2/jumptable2.adt -daf88bb18b74f7f3eb7210dce4c58ba1 correct/jumptable2/gcc_O2/jumptable2.bir db7967b2d3f16668d93b8ba9a021e46c correct/jumptable2/gcc_O2/jumptable2.relf 6c3ba6c2d2f52bf4a4a9febfb9264671 correct/jumptable2/gcc_O2/jumptable2.gts diff --git a/src/test/correct/jumptable2/gcc_pic/md5sums b/src/test/correct/jumptable2/gcc_pic/md5sums index 4347c4d94..e77c97861 100644 --- a/src/test/correct/jumptable2/gcc_pic/md5sums +++ b/src/test/correct/jumptable2/gcc_pic/md5sums @@ -1,5 +1,3 @@ 8ddcf327f34a9a08d802d11ad4662fa4 correct/jumptable2/gcc_pic/a.out -76bb2cc11e5d83b3dcb3c9cdae069695 correct/jumptable2/gcc_pic/jumptable2.adt -882932072c55e58647631354a5fc2db0 correct/jumptable2/gcc_pic/jumptable2.bir 6cae7faa1ec96164ee34b07cb82297a8 correct/jumptable2/gcc_pic/jumptable2.relf bac9369d8ce76e145e4d169e85d8b3e3 correct/jumptable2/gcc_pic/jumptable2.gts diff --git a/src/test/make/lift-directories.mk b/src/test/make/lift-directories.mk index eaa1434d1..785283e8f 100644 --- 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