Skip to content

Commit

Permalink
Merge branch 'nix-docker-build' into nix-docker-build-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
katrinafyi committed Dec 17, 2024
2 parents 19c0440 + 9073116 commit 45caed6
Show file tree
Hide file tree
Showing 311 changed files with 757 additions and 802 deletions.
2 changes: 2 additions & 0 deletions src/test/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ docker-hash-new
!compiled.url.txt
*.gz
*.bz2
*.xz
*.zst
4 changes: 2 additions & 2 deletions src/test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ $(SUBDIRS):
# check with `md5sum -c compiled.md5sum` in src/test.
.PHONY: compiled.md5sum
compiled.md5sum:
find $(DIRS) -name 'md5sums' -exec cat '{}' + > compiled.md5sum
find $(DIRS) -name '*.md5sum' -exec cat '{}' + | sort -k2 > compiled.md5sum

TARBALL := compiled.tar.bz2
TARBALL := compiled.tar.zst

$(TARBALL) docker-contents.txt &: compiled.md5sum
set -u; $$DOCKER_CMD hash > docker-contents.txt # before compessing, make sure docker-contents.txt is up to date.
Expand Down
1,482 changes: 726 additions & 756 deletions src/test/compiled.md5sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/test/compiled.url.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
https://files.catbox.moe/vy35tk.bz2
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
Expand All @@ -9,4 +9,4 @@ https://files.catbox.moe/vy35tk.bz2
#
# make sure to update both URL and sha1sum simultaneously.

76172bd26b04f1ceb0aa1d5b698072aa97500c53 compiled.tar.bz2
9bae8d55898d6715b27323de74954086de86d2cc compiled.tar.zst
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion src/test/correct/functionpointer/config.mk
Original file line number Diff line number Diff line change
@@ -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)
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion src/test/correct/indirect_call/config.mk
Original file line number Diff line number Diff line change
@@ -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)
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion src/test/correct/jumptable2/config.mk
Original file line number Diff line number Diff line change
@@ -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)
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
11 changes: 8 additions & 3 deletions src/test/make/lift-directories.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit 45caed6

Please sign in to comment.