Rework the tests to conform to the uniform interface

1 files changed, 12 insertions, 10 deletions

diff --git a/tests/cxx/parser/built-in/makefile b/tests/cxx/parser/built-in/makefile
index 7a30cdb..49eb681 100644
--- a/tests/cxx/parser/built-in/makefile
+++ b/tests/cxx/parser/built-in/makefile
@@ -8,6 +8,8 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
 xsd := test.xsd
 cxx := driver.cxx
 
+tests := 000 001
+
 obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=-pskel.o))
 dep := $(obj:.o=.o.d)
 
@@ -38,17 +40,17 @@ $(call include-dep,$(dep))
 $(out_base)/: $(driver)
 
 
-# Test.
+# Test. 000 - long, 001 - long long; the test driver ignores one.
 #
-$(test): driver := $(driver)
-
-ifeq ($(xsde_longlong),y)
-$(test): $(driver) $(src_base)/test-long-long-000.xml $(src_base)/test-long-long-000.std
-	$(call message,test $$1,$$1 $(src_base)/test-long-long-000.xml | diff -u $(src_base)/test-long-long-000.std -,$(driver))
-else
-$(test): $(driver) $(src_base)/test-long-000.xml $(src_base)/test-long-000.std
-	$(call message,test $$1,$$1 $(src_base)/test-long-000.xml | diff -u $(src_base)/test-long-000.std -,$(driver))
-endif
+test_targets := $(addprefix $(out_base)/.test-,$(tests))
+
+$(test): $(test_targets)
+$(test_targets): driver := $(driver)
+
+.PHONY: $(out_base)/.test-%
+$(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src_base)/test-%.std
+	$(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -)
+
 
 # Clean.
 #