[tests] Move definition of COMMAND to tests/Makefile.boilerplate

thoni56 · Jun 10, 2024 · 94b574b · 94b574b
1 parent efe5a23
commit 94b574b
Show file tree

Hide file tree

Showing 71 changed files with 64 additions and 229 deletions.
diff --git a/tests/Makefile.boilerplate b/tests/Makefile.boilerplate
@@ -10,10 +10,15 @@
 
 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
+COMMAND = $(CXREF) $(ARGUMENTS)
 
+# Define the test name as the directory name
 TEST = $(shell basename '$(CURDIR)')
 
+
 all: .c-xrefrc $(TEST)
 $(TEST): .c-xrefrc
 
@@ -61,6 +66,8 @@ coverage:
 	$(MAKE) $(TEST)
 	cd ../../src ; make COVERAGE_CASE=$(TEST) the-actual-coverage-report
 
+# Targets for debugging with gdb or lldb, so far only works for tests
+# that do not use the server driver
 gdb:
 	gdb $(CXREF) -ex 'br main' -ex 'run $(ARGUMENTS)'
 

diff --git a/tests/test_add_parameter/Makefile b/tests/test_add_parameter/Makefile
@@ -1,10 +1,10 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref
+
 ARGUMENTS = -xrefactory-II -refactory -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR) -rfct-add-param -olcxparnum=2 -rfct-param1=int\ arg -rfct-param2=42 -olcursor=17 $(CURDIR)/source.c
 
 $(TEST): clean
-	$(CXREF) $(ARGUMENTS) -log=log $(EXTRA) > output.tmp
+	$(COMMAND) -log=log $(EXTRA) > output.tmp
 	@$(NORMALIZE) output.tmp | grep -v progress > output
 	@$(VERIFY)
 

diff --git a/tests/test_add_parameter_after_void/Makefile b/tests/test_add_parameter_after_void/Makefile
@@ -1,10 +1,10 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref
+
 ARGUMENTS = -xrefactory-II -refactory -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR) -rfct-add-param -olcxparnum=2 -rfct-param1="int arg" -rfct-param2=42 -olcursor=16 $(CURDIR)/hello.c
 
 $(TEST): clean
-	$(CXREF) $(ARGUMENTS) -log=log $(EXTRA) > output.tmp
+	$(COMMAND) -log=log $(EXTRA) > output.tmp
 	@$(NORMALIZE) output.tmp | grep -v progress > output
 	@$(VERIFY)
 

diff --git a/tests/test_add_parameter_outside_range/Makefile b/tests/test_add_parameter_outside_range/Makefile
@@ -1,10 +1,10 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref
+
 ARGUMENTS = -xrefactory-II -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR) -refactory -rfct-add-param -olcxparnum=14 -rfct-param1="int arg" -rfct-param2=42 -olcursor=70 $(CURDIR)/source.c
 
 $(TEST): clean
-	$(CXREF) $(ARGUMENTS) -log=log $(EXTRA) > output.tmp
+	$(COMMAND) -log=log $(EXTRA) > output.tmp
 	@$(NORMALIZE) output.tmp | grep -v progress > output
 	@$(VERIFY)
 

diff --git a/tests/test_add_parameter_to_empty/Makefile b/tests/test_add_parameter_to_empty/Makefile
@@ -1,10 +1,10 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref
+
 ARGUMENTS = -xrefactory-II -refactory -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR) -rfct-add-param -olcxparnum=1 -rfct-param1="int arg" -rfct-param2=42 -olcursor=16 $(CURDIR)/hello.c
 
 $(TEST): clean
-	$(CXREF) $(ARGUMENTS) -log=log $(EXTRA) > output.tmp
+	$(COMMAND) -log=log $(EXTRA) > output.tmp
 	@$(NORMALIZE) output.tmp | grep -v progress > output
 	@$(VERIFY)
 

diff --git a/tests/test_add_parameter_to_void/Makefile b/tests/test_add_parameter_to_void/Makefile
@@ -1,10 +1,10 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref
+
 ARGUMENTS = -xrefactory-II -refactory -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR) -rfct-add-param -olcxparnum=1 -rfct-param1="int arg" -rfct-param2=42 -olcursor=16 $(CURDIR)/hello.c
 
 $(TEST): clean
-	$(CXREF) $(ARGUMENTS) -log=log $(EXTRA) > output.tmp
+	$(COMMAND) -log=log $(EXTRA) > output.tmp
 	@$(NORMALIZE) output.tmp | grep -v progress > output
 	@$(VERIFY)
 

diff --git a/tests/test_bracketed_include/Makefile b/tests/test_bracketed_include/Makefile
@@ -1,10 +1,10 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref
+
 ARGUMENTS = -create -xrefrc .c-xrefrc -p $(CURDIR) -log=log source.c
 
 $(TEST): .c-xrefrc
-	$(CXREF) $(ARGUMENTS) > output.tmp
+	$(COMMAND) > output.tmp
 	@$(NORMALIZE) output.tmp > output
 	grep "failed to open" log ; \
 	if [ $$? -eq 0 ] ; then \

diff --git a/tests/test_c_extract_with_argument/Makefile b/tests/test_c_extract_with_argument/Makefile
@@ -1,6 +1,5 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref
 
 $(TEST):
 	@-$(EDIT_SERVER_DRIVER) commands.input $(EXTRA) > output.tmp

diff --git a/tests/test_c_parsing/Makefile b/tests/test_c_parsing/Makefile
@@ -1,11 +1,11 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref
+
 ARGUMENTS = -xrefrc .c-xrefrc test_source/hello.c
 
 # This test will always succeed unless c-xref fails
 $(TEST): clean
-	@$(CXREF) $(ARGUMENTS) -o output.tmp
+	@$(COMMAND) -o output.tmp
 	@$(NORMALIZE) output.tmp >> output
 	@$(OK)
 	@exit 0

diff --git a/tests/test_c_simple_extract_function/Makefile b/tests/test_c_simple_extract_function/Makefile
@@ -1,6 +1,5 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref
 
 $(TEST): clean
 	@# First do the extract

diff --git a/tests/test_c_simple_extract_macro/Makefile b/tests/test_c_simple_extract_macro/Makefile
@@ -1,6 +1,5 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref
 
 $(TEST): clean
 	@# First do the extract

diff --git a/tests/test_cexercise_browsing/Makefile b/tests/test_cexercise_browsing/Makefile
@@ -10,8 +10,7 @@ $(TEST): CXrefs
 trace: EXTRA = \'-trace\'
 trace: $(TEST)
 
-CXREF = ../../src/c-xref
-COMMAND = $(CXREF) -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR) -create
+ARGUMENTS = -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR) -create
 
 CXrefs: .c-xrefrc
 	@# Sources are not here but in subdir

diff --git a/tests/test_cexercise_completions/Makefile b/tests/test_cexercise_completions/Makefile
@@ -1,8 +1,5 @@
-# Automated tests for C exercise : completions()
-
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR)
 
 $(TEST): .c-xrefrc
 	@-$(EDIT_SERVER_DRIVER) commands.input $(EXTRA) > output.tmp

diff --git a/tests/test_cexercise_completions_with_parenthesis/Makefile b/tests/test_cexercise_completions_with_parenthesis/Makefile
@@ -1,8 +1,5 @@
-# Automated tests for C exercise : completions()
-
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR)
 
 $(TEST): .c-xrefrc
 	@-$(EDIT_SERVER_DRIVER) commands.input $(EXTRA) > output.tmp

diff --git a/tests/test_cexercise_extract_function/Makefile b/tests/test_cexercise_extract_function/Makefile
@@ -1,7 +1,5 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR)
-COMMAND = $(CXREF)
 
 $(TEST): .c-xrefrc
 	@-$(EDIT_SERVER_DRIVER) commands.input $(EXTRA) > output.tmp

diff --git a/tests/test_cexercise_extract_macro/Makefile b/tests/test_cexercise_extract_macro/Makefile
@@ -1,7 +1,5 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR)
-COMMAND = $(CXREF)
 
 $(TEST): .c-xrefrc
 	@-$(EDIT_SERVER_DRIVER) commands.input $(EXTRA) > output.tmp

diff --git a/tests/test_cexercise_parameters_1_add/Makefile b/tests/test_cexercise_parameters_1_add/Makefile
@@ -1,7 +1,5 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR)
-COMMAND = $(CXREF)
 
 $(TEST): .c-xrefrc
 	@-$(EDIT_SERVER_DRIVER) commands.input $(EXTRA) > output.tmp

diff --git a/tests/test_cexercise_parameters_2_delete/Makefile b/tests/test_cexercise_parameters_2_delete/Makefile
@@ -1,9 +1,5 @@
-# Automated tests for C exercise : completions()
-
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR)
-COMMAND = $(CXREF)
 
 $(TEST): .c-xrefrc
 	@-$(EDIT_SERVER_DRIVER) commands.input $(EXTRA) > output.tmp

diff --git a/tests/test_cexercise_parameters_3_remove_used/Makefile b/tests/test_cexercise_parameters_3_remove_used/Makefile
@@ -1,7 +1,5 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR)
-COMMAND = $(CXREF)
 
 $(TEST): .c-xrefrc
 	@-$(EDIT_SERVER_DRIVER) commands.input $(EXTRA) > output.tmp

diff --git a/tests/test_cexercise_parameters_4_add_with_clash/Makefile b/tests/test_cexercise_parameters_4_add_with_clash/Makefile
@@ -1,9 +1,5 @@
-# Automated tests for C exercise : completions()
-
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR)
-COMMAND = $(CXREF)
 
 $(TEST): .c-xrefrc
 	@-$(EDIT_SERVER_DRIVER) commands.input $(EXTRA) > output.tmp

diff --git a/tests/test_cexercise_rename_1_local_variable/Makefile b/tests/test_cexercise_rename_1_local_variable/Makefile
@@ -1,9 +1,5 @@
-# Automated tests for C exercise : completions()
-
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR)
-COMMAND = $(CXREF)
 
 $(TEST): .c-xrefrc
 	@-$(EDIT_SERVER_DRIVER) commands.input $(EXTRA) > output.tmp

diff --git a/tests/test_cexercise_rename_2_function/Makefile b/tests/test_cexercise_rename_2_function/Makefile
@@ -1,10 +1,5 @@
-# Automated tests for C exercise : completions()
-
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR)
-COMMAND = $(CXREF)
-
 $(TEST): .c-xrefrc
 	@-$(EDIT_SERVER_DRIVER) commands.input $(EXTRA) > output.tmp
 	@$(NORMALIZE) output.tmp > output

diff --git a/tests/test_cexercise_rename_3_inside_macro/Makefile b/tests/test_cexercise_rename_3_inside_macro/Makefile
@@ -1,9 +1,5 @@
-# Automated tests for C exercise : completions()
-
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR)
-COMMAND = $(CXREF)
 
 $(TEST): .c-xrefrc
 	@-$(EDIT_SERVER_DRIVER) commands.input $(EXTRA) > output.tmp

diff --git a/tests/test_cexercise_rename_4_macro_parameter/Makefile b/tests/test_cexercise_rename_4_macro_parameter/Makefile
@@ -1,7 +1,5 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR)
-COMMAND = $(CXREF)
 
 $(TEST): CXrefs
 	@-$(EDIT_SERVER_DRIVER) commands.input $(EXTRA) > output.tmp

diff --git a/tests/test_cexercise_rename_5_name_collision/Makefile b/tests/test_cexercise_rename_5_name_collision/Makefile
@@ -1,7 +1,5 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR)
-COMMAND = $(CXREF)
 
 $(TEST): .c-xrefrc
 	@-$(EDIT_SERVER_DRIVER) commands.input $(EXTRA) > output.tmp

diff --git a/tests/test_cexercise_rename_6_macro_refers_to_different_variables/Makefile b/tests/test_cexercise_rename_6_macro_refers_to_different_variables/Makefile
@@ -1,9 +1,5 @@
-# Automated tests for C exercise : completions()
-
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR)
-COMMAND = $(CXREF)
 
 $(TEST): .c-xrefrc
 	@-$(EDIT_SERVER_DRIVER) commands.input $(EXTRA) > output.tmp

diff --git a/tests/test_cgram_coverage/Makefile b/tests/test_cgram_coverage/Makefile
@@ -1,8 +1,7 @@
 include ../Makefile.boilerplate
 
-COMMAND = ../../src/c-xref -xrefrc .c-xrefrc cgram_coverage.c -o $(TEST).log
 
-CHECK_FOR_CONTENT = python -c "content=open('$(1)').read(); target=open('output').read(); exit(0 if content in target else 1);"
+ARGUMENTS = -xrefrc .c-xrefrc cgram_coverage.c -o $(TEST).log
 
 $(TEST):
 	rm -rf output $@.log CXrefs

diff --git a/tests/test_compound_literal/Makefile b/tests/test_compound_literal/Makefile
@@ -1,6 +1,7 @@
 include ../Makefile.boilerplate
 
-COMMAND = ../../src/c-xref -p $(CURDIR) -xrefrc .c-xrefrc test_sources/source.c -o output
+ARGUMENTS = -p $(CURDIR) -xrefrc .c-xrefrc test_sources/source.c -o output
+
 $(TEST):
 	@$(COMMAND)
 	@# Is there a reference to the integer field on line with compound literal?

diff --git a/tests/test_create_references_in_subdir/Makefile b/tests/test_create_references_in_subdir/Makefile
@@ -1,12 +1,12 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref
+
 ARGUMENTS = -xrefactory-II -create -errors -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR) -o output
 
 $(TEST): .c-xrefrc
 	@sed -e 's:/CXrefs$$:/CXrefs/subdir:' .c-xrefrc > .c-xrefrc.tmp
 	@mv .c-xrefrc.tmp .c-xrefrc
-	@-$(CXREF) $(ARGUMENTS) > stdout
+	@-$(COMMAND) > stdout
 	@if [ -d CXrefs/subdir ] ; then \
 		$(OK) ; \
 	else \

diff --git a/tests/test_delete_last_macro_argument/Makefile b/tests/test_delete_last_macro_argument/Makefile
@@ -1,6 +1,5 @@
 include ../Makefile.boilerplate
 
-COMMAND = ../../src/c-xref -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR)
 
 $(TEST): .c-xrefrc
 	@-$(EDIT_SERVER_DRIVER) commands.input $(EXTRA) > output.tmp

diff --git a/tests/test_delete_no_parameter/Makefile b/tests/test_delete_no_parameter/Makefile
@@ -1,10 +1,10 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref
+
 ARGUMENTS = -xrefactory-II -refactory -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR) -rfct-del-param -olcxparnum=1 -olcursor=36 $(CURDIR)/hello.c
 
 $(TEST): .c-xrefrc
-	$(CXREF) $(ARGUMENTS) -log=log $(EXTRA) > output.tmp
+	$(COMMAND) -log=log $(EXTRA) > output.tmp
 	@$(NORMALIZE) output.tmp | grep -v progress > output
 	@$(VERIFY)
 

diff --git a/tests/test_delete_void_parameter/Makefile b/tests/test_delete_void_parameter/Makefile
@@ -1,10 +1,10 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref
+
 ARGUMENTS = -xrefactory-II -refactory -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR) -rfct-del-param -olcxparnum=1 -olcursor=17 $(CURDIR)/hello.c
 
 $(TEST): .c-xrefrc
-	$(CXREF) $(ARGUMENTS) -log=log $(EXTRA) > output.tmp
+	$(COMMAND) -log=log $(EXTRA) > output.tmp
 	@$(NORMALIZE) output.tmp | grep -v progress > output
 	@$(VERIFY)
 

diff --git a/tests/test_edit_server_test_example/Makefile b/tests/test_edit_server_test_example/Makefile
@@ -1,6 +1,5 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref
 
 $(TEST): CXrefs
 	@$(EDIT_SERVER_DRIVER) commands.input $(EXTRA) > output.tmp

diff --git a/tests/test_extract_out_argument/Makefile b/tests/test_extract_out_argument/Makefile
@@ -1,10 +1,10 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref
+
 ARGUMENTS = -xrefactory-II -xrefrc $(CURDIR)/.c-xrefrc -p $(CURDIR) -refactory -rfct-extract-function -olmark=50 -olcursor=80 $(CURDIR)/source.c
 
 $(TEST): clean
-	$(CXREF) $(ARGUMENTS) -log=log $(EXTRA) > output.tmp
+	$(COMMAND) -log=log $(EXTRA) > output.tmp
 	@$(NORMALIZE) output.tmp | grep -v progress > output
 	@$(VERIFY)
 

diff --git a/tests/test_extract_with_complicated_comments_around/Makefile b/tests/test_extract_with_complicated_comments_around/Makefile
@@ -1,6 +1,5 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref
 
 $(TEST): clean
 	@-$(EDIT_SERVER_DRIVER) commands.input $(EXTRA) > output.tmp

diff --git a/tests/test_extract_with_return/Makefile b/tests/test_extract_with_return/Makefile
@@ -1,6 +1,5 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref
 
 $(TEST): clean
 	@-$(EDIT_SERVER_DRIVER) commands.input $(EXTRA) > output.tmp

diff --git a/tests/test_fileunused/Makefile b/tests/test_fileunused/Makefile
@@ -1,6 +1,5 @@
 include ../Makefile.boilerplate
 
-CXREF = ../../src/c-xref
 
 $(TEST): clean
 	@-$(EDIT_SERVER_DRIVER) commands.input $(EXTRA) > output.tmp

diff --git a/tests/test_for_with_declaration/Makefile b/tests/test_for_with_declaration/Makefile
@@ -1,9 +1,6 @@
 include ../Makefile.boilerplate
 
 
-CXREF = ../../src/c-xref
-COMMAND = $(CXREF) -xrefactory-II -create -errors -xrefrc .c-xrefrc -p $(CURDIR) $(TRACE) source.c -log=log -o output.tmp
-
 $(TEST): .c-xrefrc
 	$(COMMAND) > out
 	@$(NORMALIZE) output.tmp > output