From 36f53cdc3bb556a7ec31b67c9b20ec32892e7142 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Reimar=20D=C3=B6ffinger?= Date: Mon, 30 Oct 2023 18:38:36 +0100 Subject: [PATCH] Revert "tests: Add support for codesigning command." This reverts commit ece74ceaaf0f1dd89e8520f73149867a6fa73082. codesigning is already supported via --config-codesign. This patch actually broke testing for tcc builds with that set. --- Makefile | 6 ------ tests/Makefile | 6 +----- tests/tests2/Makefile | 7 ++----- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 018b9887..11cc9a88 100644 --- a/Makefile +++ b/Makefile @@ -77,12 +77,6 @@ TCCFLAGS = $(TCCFLAGS$(CFG)) TCC_LOCAL = $(TOP)/tcc$(EXESUF) TCC = $(TCC_LOCAL) $(TCCFLAGS) -ifdef CONFIG_OSX -CODESIGN = codesign -s - -else -CODESIGN = true -endif - CFLAGS_P = $(CFLAGS) -pg -static -DCONFIG_TCC_STATIC -DTCC_PROFILE LIBS_P = $(LIBS) LDFLAGS_P = $(LDFLAGS) diff --git a/tests/Makefile b/tests/Makefile index 020ed049..a46c8524 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -81,7 +81,7 @@ all test : hello-exe: ../examples/ex1.c @echo ------------ $@ ------------ - $(TCC) $< -o hello$(EXESUF) && $(CODESIGN) hello$(EXESUF) && ./hello$(EXESUF) || $(DUMPTCC) + $(TCC) $< -o hello$(EXESUF) && ./hello$(EXESUF) || $(DUMPTCC) hello-run: ../examples/ex1.c @echo ------------ $@ ------------ @@ -156,9 +156,7 @@ test4_static: tcctest.c test.ref dlltest: @echo ------------ $@ ------------ $(TCC) $(NATIVE_DEFINES) -DLIBTCC_AS_DLL $(TOPSRC)/libtcc.c $(LIBS) -shared -o libtcc2$(DLLSUF) - $(CODESIGN) libtcc2$(DLLSUF) $(TCC) $(NATIVE_DEFINES) -DONE_SOURCE=0 $(TOPSRC)/tcc.c libtcc2$(DLLSUF) $(LIBS) -Wl,-rpath=. -o tcc2$(EXESUF) - $(CODESIGN) tcc2$(EXESUF) ./tcc2$(EXESUF) $(TCCFLAGS) $(RUN_TCC) -run $(TOPSRC)/examples/ex1.c ifeq (,$(filter Darwin WIN32,$(TARGETOS))) @echo ------------ $@ with PIC ------------ @@ -243,7 +241,6 @@ abitest-cc.exe: abitest.c $(LIBTCC) abitest-tcc.exe: abitest.c libtcc.c $(TCC) -o $@ $^ $(NATIVE_DEFINES) $(LIBS) - $(CODESIGN) $@ abitest-% : abitest-%.exe @echo ------------ $@ ------------ @@ -256,7 +253,6 @@ endif vla_test$(EXESUF): vla_test.c $(TCC) -o $@ $^ - $(CODESIGN) $@ vla_test-run: vla_test$(EXESUF) @echo ------------ $@ ------------ diff --git a/tests/tests2/Makefile b/tests/tests2/Makefile index fe140751..8ce149b2 100644 --- a/tests/tests2/Makefile +++ b/tests/tests2/Makefile @@ -105,11 +105,8 @@ GEN-ALWAYS = # this test creates two DLLs and an EXE 113_btdll.test: T1 = \ $(TCC) -bt $1 -shared -D DLL=1 -o a1$(DLLSUF) && \ - $(CODESIGN) a1$(DLLSUF) && \ $(TCC) -bt $1 -shared -D DLL=2 -o a2$(DLLSUF) && \ - $(CODESIGN) a2$(DLLSUF) && \ $(TCC) -bt $1 a1$(DLLSUF) a2$(DLLSUF) -Wl,-rpath=. -o $(basename $@).exe && \ - $(CODESIGN) $(basename $@).exe && \ ./$(basename $@).exe 114_bound_signal.test: FLAGS += -b @@ -139,7 +136,7 @@ all test tests2.all: $(filter-out $(SKIP),$(TESTS)) @$(call T1,$<) $(T3) T1 = $(TCC) $(FLAGS) $(T2) $(ARGS) -T2 = $(if $(NORUN),$1 -o $(basename $@).exe && $(CODESIGN) $(basename $@).exe && ./$(basename $@).exe,-run $1) +T2 = $(if $(NORUN),$1 -o $(basename $@).exe && ./$(basename $@).exe,-run $1) T3 = $(FILTER) >$*.output 2>&1 || true \ && diff -Nbu $(filter %.expect,$^) $*.output \ && rm -f $*.output $(filter $*.expect,$(GEN-ALWAYS)) @@ -180,4 +177,4 @@ $(sort $(GEN-ALWAYS) $(UPDATE)) : force force: clean : - rm -f fred.txt *.output *.exe *.dll *.so *.dylib *.def $(GEN-ALWAYS) + rm -f fred.txt *.output *.exe *.dll *.so *.def $(GEN-ALWAYS) -- 2.11.4.GIT