Make the tests more uniform

43 files changed, 30 insertions, 30 deletions

diff --git a/tests/cxx/parser/built-in/makefile b/tests/cxx/parser/built-in/makefile
index 8446efe..7a30cdb 100644
--- a/tests/cxx/parser/built-in/makefile
+++ b/tests/cxx/parser/built-in/makefile
@@ -43,11 +43,11 @@ $(out_base)/: $(driver)
 $(test): driver := $(driver)
 
 ifeq ($(xsde_longlong),y)
-$(test): $(driver) $(src_base)/test-long-long.xml $(src_base)/output-long-long
-	$(call message,test $$1,$$1 $(src_base)/test-long-long.xml | diff -u $(src_base)/output-long-long -,$(driver))
+$(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.xml $(src_base)/output-long
-	$(call message,test $$1,$$1 $(src_base)/test-long.xml | diff -u $(src_base)/output-long -,$(driver))
+$(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
 
 # Clean.
diff --git a/tests/cxx/parser/built-in/output-long b/tests/cxx/parser/built-in/test-long-000.std
index f3526bc..f3526bc 100644
--- a/tests/cxx/parser/built-in/output-long
+++ b/tests/cxx/parser/built-in/test-long-000.std
diff --git a/tests/cxx/parser/built-in/test-long.xml b/tests/cxx/parser/built-in/test-long-000.xml
index 380b0f4..380b0f4 100644
--- a/tests/cxx/parser/built-in/test-long.xml
+++ b/tests/cxx/parser/built-in/test-long-000.xml
diff --git a/tests/cxx/parser/built-in/output-long-long b/tests/cxx/parser/built-in/test-long-long-000.std
index 3b80787..3b80787 100644
--- a/tests/cxx/parser/built-in/output-long-long
+++ b/tests/cxx/parser/built-in/test-long-long-000.std
diff --git a/tests/cxx/parser/built-in/test-long-long.xml b/tests/cxx/parser/built-in/test-long-long-000.xml
index 8d9332a..8d9332a 100644
--- a/tests/cxx/parser/built-in/test-long-long.xml
+++ b/tests/cxx/parser/built-in/test-long-long-000.xml
diff --git a/tests/cxx/parser/duplicate/makefile b/tests/cxx/parser/duplicate/makefile
index 85a7f5b..8c7b717 100644
--- a/tests/cxx/parser/duplicate/makefile
+++ b/tests/cxx/parser/duplicate/makefile
@@ -44,8 +44,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/test.xml $(src_base)/output
-	$(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std
+	$(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/parser/duplicate/output b/tests/cxx/parser/duplicate/test-000.std
index f03814e..f03814e 100644
--- a/tests/cxx/parser/duplicate/output
+++ b/tests/cxx/parser/duplicate/test-000.std
diff --git a/tests/cxx/parser/duplicate/test.xml b/tests/cxx/parser/duplicate/test-000.xml
index 62e4c0b..62e4c0b 100644
--- a/tests/cxx/parser/duplicate/test.xml
+++ b/tests/cxx/parser/duplicate/test-000.xml
diff --git a/tests/cxx/parser/enumeration/makefile b/tests/cxx/parser/enumeration/makefile
index 56d3e92..0997aab 100644
--- a/tests/cxx/parser/enumeration/makefile
+++ b/tests/cxx/parser/enumeration/makefile
@@ -45,8 +45,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/test.xml $(src_base)/output
-	$(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std
+	$(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/parser/enumeration/output b/tests/cxx/parser/enumeration/test-000.std
index 16db301..16db301 100644
--- a/tests/cxx/parser/enumeration/output
+++ b/tests/cxx/parser/enumeration/test-000.std
diff --git a/tests/cxx/parser/enumeration/test.xml b/tests/cxx/parser/enumeration/test-000.xml
index a6fa893..a6fa893 100644
--- a/tests/cxx/parser/enumeration/test.xml
+++ b/tests/cxx/parser/enumeration/test-000.xml
diff --git a/tests/cxx/parser/error-handling/codes/makefile b/tests/cxx/parser/error-handling/codes/makefile
index 8f130b1..370db75 100644
--- a/tests/cxx/parser/error-handling/codes/makefile
+++ b/tests/cxx/parser/error-handling/codes/makefile
@@ -43,8 +43,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/test.xml $(src_base)/output
-	$(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std
+	$(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/parser/error-handling/codes/output b/tests/cxx/parser/error-handling/codes/test-000.std
index bdf6520..bdf6520 100644
--- a/tests/cxx/parser/error-handling/codes/output
+++ b/tests/cxx/parser/error-handling/codes/test-000.std
diff --git a/tests/cxx/parser/error-handling/codes/test.xml b/tests/cxx/parser/error-handling/codes/test-000.xml
index 07def4b..07def4b 100644
--- a/tests/cxx/parser/error-handling/codes/test.xml
+++ b/tests/cxx/parser/error-handling/codes/test-000.xml
diff --git a/tests/cxx/parser/error-handling/exceptions/makefile b/tests/cxx/parser/error-handling/exceptions/makefile
index 7503803..e1a038c 100644
--- a/tests/cxx/parser/error-handling/exceptions/makefile
+++ b/tests/cxx/parser/error-handling/exceptions/makefile
@@ -44,8 +44,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/test.xml $(src_base)/output
-	$(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std
+	$(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/parser/error-handling/exceptions/output b/tests/cxx/parser/error-handling/exceptions/test-000.std
index b8046aa..b8046aa 100644
--- a/tests/cxx/parser/error-handling/exceptions/output
+++ b/tests/cxx/parser/error-handling/exceptions/test-000.std
diff --git a/tests/cxx/parser/error-handling/exceptions/test.xml b/tests/cxx/parser/error-handling/exceptions/test-000.xml
index 07def4b..07def4b 100644
--- a/tests/cxx/parser/error-handling/exceptions/test.xml
+++ b/tests/cxx/parser/error-handling/exceptions/test-000.xml
diff --git a/tests/cxx/parser/generated-impl/makefile b/tests/cxx/parser/generated-impl/makefile
index 49ed042..7d5d6f6 100644
--- a/tests/cxx/parser/generated-impl/makefile
+++ b/tests/cxx/parser/generated-impl/makefile
@@ -44,8 +44,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/test.xml $(src_base)/output
-	$(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std
+	$(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/parser/generated-impl/output b/tests/cxx/parser/generated-impl/test-000.std
index 7c58647..7c58647 100644
--- a/tests/cxx/parser/generated-impl/output
+++ b/tests/cxx/parser/generated-impl/test-000.std
diff --git a/tests/cxx/parser/generated-impl/test.xml b/tests/cxx/parser/generated-impl/test-000.xml
index 2f29a39..2f29a39 100644
--- a/tests/cxx/parser/generated-impl/test.xml
+++ b/tests/cxx/parser/generated-impl/test-000.xml
diff --git a/tests/cxx/parser/list/makefile b/tests/cxx/parser/list/makefile
index 0624da0..e709106 100644
--- a/tests/cxx/parser/list/makefile
+++ b/tests/cxx/parser/list/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/test.xml $(src_base)/output
-	$(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std
+	$(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/parser/list/output b/tests/cxx/parser/list/test-000.std
index 3642c4d..3642c4d 100644
--- a/tests/cxx/parser/list/output
+++ b/tests/cxx/parser/list/test-000.std
diff --git a/tests/cxx/parser/list/test.xml b/tests/cxx/parser/list/test-000.xml
index 52229db..52229db 100644
--- a/tests/cxx/parser/list/test.xml
+++ b/tests/cxx/parser/list/test-000.xml
diff --git a/tests/cxx/parser/name-clash/inheritance/makefile b/tests/cxx/parser/name-clash/inheritance/makefile
index b05a021..56599cd 100644
--- a/tests/cxx/parser/name-clash/inheritance/makefile
+++ b/tests/cxx/parser/name-clash/inheritance/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/test.xml $(src_base)/output
-	$(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std
+	$(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/parser/name-clash/inheritance/output b/tests/cxx/parser/name-clash/inheritance/test-000.std
index 4efd51b..4efd51b 100644
--- a/tests/cxx/parser/name-clash/inheritance/output
+++ b/tests/cxx/parser/name-clash/inheritance/test-000.std
diff --git a/tests/cxx/parser/name-clash/inheritance/test.xml b/tests/cxx/parser/name-clash/inheritance/test-000.xml
index 8c17101..8c17101 100644
--- a/tests/cxx/parser/name-clash/inheritance/test.xml
+++ b/tests/cxx/parser/name-clash/inheritance/test-000.xml
diff --git a/tests/cxx/parser/polymorphism/makefile b/tests/cxx/parser/polymorphism/makefile
index 6ffff5f..e60f68e 100644
--- a/tests/cxx/parser/polymorphism/makefile
+++ b/tests/cxx/parser/polymorphism/makefile
@@ -42,8 +42,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/test.xml $(src_base)/output
-	$(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std
+	$(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/parser/polymorphism/output b/tests/cxx/parser/polymorphism/test-000.std
index 87168ca..87168ca 100644
--- a/tests/cxx/parser/polymorphism/output
+++ b/tests/cxx/parser/polymorphism/test-000.std
diff --git a/tests/cxx/parser/polymorphism/test.xml b/tests/cxx/parser/polymorphism/test-000.xml
index 8e635cc..8e635cc 100644
--- a/tests/cxx/parser/polymorphism/test.xml
+++ b/tests/cxx/parser/polymorphism/test-000.xml
diff --git a/tests/cxx/parser/recursive/makefile b/tests/cxx/parser/recursive/makefile
index e61f71f..722bae6 100644
--- a/tests/cxx/parser/recursive/makefile
+++ b/tests/cxx/parser/recursive/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/test.xml $(src_base)/output
-	$(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std
+	$(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver))
 
 
 # Clean.
diff --git a/tests/cxx/parser/recursive/output b/tests/cxx/parser/recursive/test-000.std
index f26fb72..f26fb72 100644
--- a/tests/cxx/parser/recursive/output
+++ b/tests/cxx/parser/recursive/test-000.std
diff --git a/tests/cxx/parser/recursive/test.xml b/tests/cxx/parser/recursive/test-000.xml
index f6c219d..f6c219d 100644
--- a/tests/cxx/parser/recursive/test.xml
+++ b/tests/cxx/parser/recursive/test-000.xml
diff --git a/tests/cxx/parser/reset/makefile b/tests/cxx/parser/reset/makefile
index b4118f9..c1d683c 100644
--- a/tests/cxx/parser/reset/makefile
+++ b/tests/cxx/parser/reset/makefile
@@ -42,10 +42,10 @@ $(out_base)/: $(driver)
 #
 $(test): driver := $(driver)
 $(test): $(driver) $(src_base)/pass.xml $(src_base)/fail-xml.xml \
-                   $(src_base)/fail-schema.xml $(src_base)/output
+                   $(src_base)/fail-schema.xml $(src_base)/test.std
 	$(call message,test $$1,$$1 $(src_base)/pass.xml \
 $(src_base)/fail-xml.xml $(src_base)/fail-schema.xml \
-| diff -u $(src_base)/output -,$(driver))
+| diff -u $(src_base)/test.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/parser/reset/output b/tests/cxx/parser/reset/test.std
index 0e6cb1e..0e6cb1e 100644
--- a/tests/cxx/parser/reset/output
+++ b/tests/cxx/parser/reset/test.std
diff --git a/tests/cxx/parser/test-template/makefile b/tests/cxx/parser/test-template/makefile
index ea42416..3d95a16 100644
--- a/tests/cxx/parser/test-template/makefile
+++ b/tests/cxx/parser/test-template/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/test.xml $(src_base)/output
-	$(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std
+	$(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/parser/test-template/output b/tests/cxx/parser/test-template/test-000.std
index 7898192..7898192 100644
--- a/tests/cxx/parser/test-template/output
+++ b/tests/cxx/parser/test-template/test-000.std
diff --git a/tests/cxx/parser/test-template/test.xml b/tests/cxx/parser/test-template/test-000.xml
index 624a80c..624a80c 100644
--- a/tests/cxx/parser/test-template/test.xml
+++ b/tests/cxx/parser/test-template/test-000.xml
diff --git a/tests/cxx/parser/union/makefile b/tests/cxx/parser/union/makefile
index 217ac4e..42a14e7 100644
--- a/tests/cxx/parser/union/makefile
+++ b/tests/cxx/parser/union/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/test.xml $(src_base)/output
-	$(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std
+	$(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/parser/union/output b/tests/cxx/parser/union/test-000.std
index b698505..b698505 100644
--- a/tests/cxx/parser/union/output
+++ b/tests/cxx/parser/union/test-000.std
diff --git a/tests/cxx/parser/union/test.xml b/tests/cxx/parser/union/test-000.xml
index 5b3e799..5b3e799 100644
--- a/tests/cxx/parser/union/test.xml
+++ b/tests/cxx/parser/union/test-000.xml
diff --git a/tests/cxx/parser/validation/attribute/makefile b/tests/cxx/parser/validation/attribute/makefile
index 7316abc..078ed49 100644
--- a/tests/cxx/parser/validation/attribute/makefile
+++ b/tests/cxx/parser/validation/attribute/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/test.xml $(src_base)/output
-	$(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std
+	$(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/parser/validation/attribute/output b/tests/cxx/parser/validation/attribute/test-000.std
index 990f995..990f995 100644
--- a/tests/cxx/parser/validation/attribute/output
+++ b/tests/cxx/parser/validation/attribute/test-000.std
diff --git a/tests/cxx/parser/validation/attribute/test.xml b/tests/cxx/parser/validation/attribute/test-000.xml
index b994d1a..b994d1a 100644
--- a/tests/cxx/parser/validation/attribute/test.xml
+++ b/tests/cxx/parser/validation/attribute/test-000.xml