[tests] Redefine CXREF to include BASE_ARGUMENTS

thoni56 · Jun 20, 2024 · a87c773 · a87c773
1 parent 6aee2ff
commit a87c773
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 22 deletions.
diff --git a/tests/Makefile.boilerplate b/tests/Makefile.boilerplate
@@ -10,10 +10,11 @@
 
 include ../Makefile.messages
 
-# You can override which c-xref to run, but each test need to define ARGUMENTS
-# and can use $(COMMAND)
-CXREF = ../../src/c-xref
+# You can override which c-xref to run by setting CXREF_PROGRAM, but
+# each test need to define ARGUMENTS and can use $(COMMAND)
+CXREF_PROGRAM = ../../src/c-xref
 BASE_ARGUMENTS = -xrefrc .c-xrefrc -p $(CURDIR)
+CXREF = $(CXREF_PROGRAM) $(BASE_ARGUMENTS)
 COMMAND = $(CXREF) $(BASE_ARGUMENTS) $(ARGUMENTS)
 
 # Define the test name as the directory name

diff --git a/tests/test_cexercise_browsing/Makefile b/tests/test_cexercise_browsing/Makefile
@@ -1,5 +1,3 @@
-# Automated tests for C exercise : browsing
-
 include ../Makefile.boilerplate
 
 $(TEST): CXrefs
@@ -16,7 +14,7 @@ CXrefs: .c-xrefrc
 	@# Sources are not here but in subdir
 	@sed -e s:$(CURDIR)$$:$(CURDIR)/cexercise: .c-xrefrc > .c-xrefrc.tmp
 	@mv .c-xrefrc.tmp .c-xrefrc
-	@$(COMMAND) -o $(TEST).log
+	@$(CXREF) -create -o $(TEST).log
 
 debug:
 	@$(EDIT_SERVER_DRIVER) commands.input --delay 5 > output.tmp &

diff --git a/tests/test_full_update/Makefile b/tests/test_full_update/Makefile
@@ -8,14 +8,14 @@ $(TEST): CXrefs
 	$(NORMALIZE) output.tmp > output
 	$(VERIFY)
 
-trace: CXREF+=-trace
+trace: ARGUMENTS+=-trace
 trace: $(TEST)
 
 CXrefs: .c-xrefrc
 	# Sources in subdir:
 	sed -e s:$(CURDIR)$$:$(CURDIR)/cexercise: .c-xrefrc > .c-xrefrc.tmp
 	mv .c-xrefrc.tmp .c-xrefrc
-	$(COMMAND) -create -o $(TEST).log
+	$(CXREF) -create -o $(TEST).log
 
 clean:
 	rm -rf CXrefs .c-xrefrc
diff --git a/tests/test_get_environment_value/Makefile b/tests/test_get_environment_value/Makefile
@@ -9,8 +9,8 @@ $(TEST): CXrefs
 trace: EXTRA = \'-trace\'
 trace: $(TEST)
 
-CXrefs:
-	@$(CXREF) test_source -o cxrefs.log
+CXrefs: .c-xrefrc
+	@$(CXREF) -create test_source -o cxrefs.log
 
 clean:
 	rm -rf .c-xrefrc CXrefs output*

diff --git a/tests/test_get_project_new/Makefile b/tests/test_get_project_new/Makefile
@@ -12,7 +12,6 @@ trace debug: EXTRA+=--extra="-trace -log=log"
 trace: $(TEST)
 
 CXrefs: .c-xrefrc
-	echo CXREF
 	$(CXREF) -create
 
 clean:

diff --git a/tests/test_globalunused/Makefile b/tests/test_globalunused/Makefile
@@ -12,7 +12,7 @@ trace: $(TEST)
 ARGUMENTS = -create
 
 CXrefs: .c-xrefrc
-	@$(COMMAND) -o $(TEST).log
+	@$(CXREF) -create -o $(TEST).log
 
 clean:
 	@-rm -rf CXrefs output.log output.tmp output

diff --git a/tests/test_include_next/Makefile b/tests/test_include_next/Makefile
@@ -23,7 +23,7 @@ include ../Makefile.boilerplate
 ARGUMENTS = -create -I path1 -I path2 source.c -xrefactory-II -errors -o output.tmp
 
 $(TEST): .c-xrefrc
-	$(COMMAND) > out
+	$(COMMAND) > output.tmp
 	@$(NORMALIZE) output.tmp > output
 	grep "error len" output ; \
 	if [ $$? -eq 0 ] ; then \

diff --git a/tests/test_no_errors_on_communication_channel/Makefile b/tests/test_no_errors_on_communication_channel/Makefile
@@ -17,7 +17,7 @@ $(TEST): CXrefs
 trace: EXTRA = \'-trace\'
 trace: $(TEST)
 
-CXrefs:
+CXrefs: .c-xrefrc
 	@$(CXREF) test_source -o cxrefs.log
 
 clean:

diff --git a/tests/test_old_style_func/Makefile b/tests/test_old_style_func/Makefile
@@ -4,7 +4,7 @@ include ../Makefile.boilerplate
 ARGUMENTS = -xrefactory-II -create -errors $(TRACE) source.c -log=log -o output.tmp
 
 $(TEST): .c-xrefrc
-	$(COMMAND) > out
+	$(COMMAND) > output.tmp
 	@$(NORMALIZE) output.tmp > output
 	grep "error len" output ; \
 	if [ $$? -eq 0 ] ; then \

diff --git a/tests/test_prune_option/Makefile b/tests/test_prune_option/Makefile
@@ -4,7 +4,7 @@ include ../Makefile.boilerplate
 ARGUMENTS = -xrefactory-II -create -errors $(TRACE) -log=log -o output.tmp -prune pruned
 
 $(TEST): .c-xrefrc
-	$(COMMAND) > out
+	$(COMMAND) > output.tmp
 	@$(NORMALIZE) output.tmp > output
 	grep "pruned_source.c" output ; \
 	if [ $$? -eq 0 ] ; then \

diff --git a/tests/test_simple_block/Makefile b/tests/test_simple_block/Makefile
@@ -4,7 +4,7 @@ include ../Makefile.boilerplate
 ARGUMENTS = -xrefactory-II -create -errors $(TRACE) source.c -log=log -o output.tmp
 
 $(TEST): .c-xrefrc
-	$(COMMAND) > out
+	$(COMMAND) > output.tmp
 	@$(NORMALIZE) output.tmp > output
 	grep "error len" output ; \
 	if [ $$? -eq 0 ] ; then \

diff --git a/tests/test_simple_complete/Makefile b/tests/test_simple_complete/Makefile
@@ -11,7 +11,7 @@ $(TEST): CXrefs
 trace: EXTRA = \'-trace\'
 trace: $(TEST)
 
-CXrefs:
+CXrefs: .c-xrefrc
 	@$(CXREF) test_source -create -o $(TEST).log
 
 clean:

diff --git a/tests/test_simple_tagsearch/Makefile b/tests/test_simple_tagsearch/Makefile
@@ -10,7 +10,7 @@ trace: EXTRA = \'-trace\'
 trace: $(TEST)
 
 CXrefs:
-	@$(CXREF) test_source -create -o $(TEST).log
+	@$(CXREF) -create test_source -o $(TEST).log
 
 clean:
 	rm -rf CXrefs .c-xrefrc

diff --git a/tests/test_uint32_t/Makefile b/tests/test_uint32_t/Makefile
@@ -35,4 +35,4 @@ trace: TRACE=-trace
 trace: $(TEST)
 
 clean:
-	rm -rf .c-xrefrc CXrefs output.log output.tmp
+	rm -rf .c-xrefrc CXrefs out output output.log output.tmp
diff --git a/tests/test_update/Makefile b/tests/test_update/Makefile
@@ -9,14 +9,14 @@ $(TEST): CXrefs
 	$(NORMALIZE) output.tmp > output
 	$(VERIFY)
 
-trace: CXREF+=-trace
+trace: ARGUMENTS += -trace
 trace: $(TEST)
 
 CXrefs: .c-xrefrc
 	# Sources in subdir:
 	sed -e s:$(CURDIR)$$:$(CURDIR)/cexercise: .c-xrefrc > .c-xrefrc.tmp
 	mv .c-xrefrc.tmp .c-xrefrc
-	$(COMMAND) -create -o $(TEST).log
+	$(CXREF) -create -o $(TEST).log
 
 clean:
 	rm -rf CXrefs .c-xrefrc