Make the tests more uniform

123 files changed, 108 insertions, 97 deletions

diff --git a/tests/cxx/hashmap/makefile b/tests/cxx/hashmap/makefile
index d3f3c36..6334dc2 100644
--- a/tests/cxx/hashmap/makefile
+++ b/tests/cxx/hashmap/makefile
@@ -34,8 +34,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/hashmap/output b/tests/cxx/hashmap/test-000.std
index 295e6da..295e6da 100644
--- a/tests/cxx/hashmap/output
+++ b/tests/cxx/hashmap/test-000.std
diff --git a/tests/cxx/hybrid/binary/cdr/makefile b/tests/cxx/hybrid/binary/cdr/makefile
index c64fbb5..f5fa36f 100644
--- a/tests/cxx/hybrid/binary/cdr/makefile
+++ b/tests/cxx/hybrid/binary/cdr/makefile
@@ -54,8 +54,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/test.xml $(src_base)/output.xml
-	$(call message,test $$1,$$1 $(src_base)/test.xml | diff -ubB $(src_base)/output.xml -,$(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/hybrid/binary/cdr/output.xml b/tests/cxx/hybrid/binary/cdr/test-000.std
index f36f755..f36f755 100644
--- a/tests/cxx/hybrid/binary/cdr/output.xml
+++ b/tests/cxx/hybrid/binary/cdr/test-000.std
diff --git a/tests/cxx/hybrid/binary/cdr/test.xml b/tests/cxx/hybrid/binary/cdr/test-000.xml
index 1218c37..1218c37 100644
--- a/tests/cxx/hybrid/binary/cdr/test.xml
+++ b/tests/cxx/hybrid/binary/cdr/test-000.xml
diff --git a/tests/cxx/hybrid/binary/custom/output.xml b/tests/cxx/hybrid/binary/custom/test-000.std
index f36f755..f36f755 100644
--- a/tests/cxx/hybrid/binary/custom/output.xml
+++ b/tests/cxx/hybrid/binary/custom/test-000.std
diff --git a/tests/cxx/hybrid/binary/custom/test.xml b/tests/cxx/hybrid/binary/custom/test-000.xml
index 1218c37..1218c37 100644
--- a/tests/cxx/hybrid/binary/custom/test.xml
+++ b/tests/cxx/hybrid/binary/custom/test-000.xml
diff --git a/tests/cxx/hybrid/binary/xdr/makefile b/tests/cxx/hybrid/binary/xdr/makefile
index 678e147..348f3b9 100644
--- a/tests/cxx/hybrid/binary/xdr/makefile
+++ b/tests/cxx/hybrid/binary/xdr/makefile
@@ -55,8 +55,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/test.xml $(src_base)/output.xml
-	$(call message,test $$1,$$1 $(src_base)/test.xml | diff -ubB $(src_base)/output.xml -,$(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/hybrid/binary/xdr/output.xml b/tests/cxx/hybrid/binary/xdr/test-000.std
index f36f755..f36f755 100644
--- a/tests/cxx/hybrid/binary/xdr/output.xml
+++ b/tests/cxx/hybrid/binary/xdr/test-000.std
diff --git a/tests/cxx/hybrid/binary/xdr/test.xml b/tests/cxx/hybrid/binary/xdr/test-000.xml
index 1218c37..1218c37 100644
--- a/tests/cxx/hybrid/binary/xdr/test.xml
+++ b/tests/cxx/hybrid/binary/xdr/test-000.xml
diff --git a/tests/cxx/hybrid/built-in/makefile b/tests/cxx/hybrid/built-in/makefile
index 56a1ac3..d9531d5 100644
--- a/tests/cxx/hybrid/built-in/makefile
+++ b/tests/cxx/hybrid/built-in/makefile
@@ -55,8 +55,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 -ubB $(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/hybrid/built-in/output b/tests/cxx/hybrid/built-in/test-000.std
index 6798590..6798590 100644
--- a/tests/cxx/hybrid/built-in/output
+++ b/tests/cxx/hybrid/built-in/test-000.std
diff --git a/tests/cxx/hybrid/built-in/test.xml b/tests/cxx/hybrid/built-in/test-000.xml
index ae72e80..ae72e80 100644
--- a/tests/cxx/hybrid/built-in/test.xml
+++ b/tests/cxx/hybrid/built-in/test-000.xml
diff --git a/tests/cxx/hybrid/choice/makefile b/tests/cxx/hybrid/choice/makefile
index 4c6d669..91c893a 100644
--- a/tests/cxx/hybrid/choice/makefile
+++ b/tests/cxx/hybrid/choice/makefile
@@ -55,8 +55,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 -ubB $(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/hybrid/choice/output b/tests/cxx/hybrid/choice/test-000.std
index b299e90..b299e90 100644
--- a/tests/cxx/hybrid/choice/output
+++ b/tests/cxx/hybrid/choice/test-000.std
diff --git a/tests/cxx/hybrid/choice/test.xml b/tests/cxx/hybrid/choice/test-000.xml
index 48f06fd..48f06fd 100644
--- a/tests/cxx/hybrid/choice/test.xml
+++ b/tests/cxx/hybrid/choice/test-000.xml
diff --git a/tests/cxx/hybrid/default/makefile b/tests/cxx/hybrid/default/makefile
index 5e0e55e..5dd5d04 100644
--- a/tests/cxx/hybrid/default/makefile
+++ b/tests/cxx/hybrid/default/makefile
@@ -55,8 +55,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 -ubB $(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/hybrid/default/output b/tests/cxx/hybrid/default/test-000.std
index 8d41894..8d41894 100644
--- a/tests/cxx/hybrid/default/output
+++ b/tests/cxx/hybrid/default/test-000.std
diff --git a/tests/cxx/hybrid/default/test.xml b/tests/cxx/hybrid/default/test-000.xml
index 11bd0a7..11bd0a7 100644
--- a/tests/cxx/hybrid/default/test.xml
+++ b/tests/cxx/hybrid/default/test-000.xml
diff --git a/tests/cxx/hybrid/list/makefile b/tests/cxx/hybrid/list/makefile
index ef24411..a4f4de0 100644
--- a/tests/cxx/hybrid/list/makefile
+++ b/tests/cxx/hybrid/list/makefile
@@ -55,8 +55,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 -ubB $(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/hybrid/list/output b/tests/cxx/hybrid/list/test-000.std
index 6c1ac43..6c1ac43 100644
--- a/tests/cxx/hybrid/list/output
+++ b/tests/cxx/hybrid/list/test-000.std
diff --git a/tests/cxx/hybrid/list/test.xml b/tests/cxx/hybrid/list/test-000.xml
index 2451a4b..2451a4b 100644
--- a/tests/cxx/hybrid/list/test.xml
+++ b/tests/cxx/hybrid/list/test-000.xml
diff --git a/tests/cxx/hybrid/polymorphism/any-type/makefile b/tests/cxx/hybrid/polymorphism/any-type/makefile
index 7f44bfb..3f59fc5 100644
--- a/tests/cxx/hybrid/polymorphism/any-type/makefile
+++ b/tests/cxx/hybrid/polymorphism/any-type/makefile
@@ -56,8 +56,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 -ubB $(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/hybrid/polymorphism/any-type/test.xml b/tests/cxx/hybrid/polymorphism/any-type/test-000.xml
index f0a8bcb..f0a8bcb 100644
--- a/tests/cxx/hybrid/polymorphism/any-type/test.xml
+++ b/tests/cxx/hybrid/polymorphism/any-type/test-000.xml
diff --git a/tests/cxx/hybrid/polymorphism/multischema/makefile b/tests/cxx/hybrid/polymorphism/multischema/makefile
index 7670908..96ce17f 100644
--- a/tests/cxx/hybrid/polymorphism/multischema/makefile
+++ b/tests/cxx/hybrid/polymorphism/multischema/makefile
@@ -57,8 +57,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 -ubB $(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/hybrid/polymorphism/multischema/output b/tests/cxx/hybrid/polymorphism/multischema/test-000.std
index 341775b..341775b 100644
--- a/tests/cxx/hybrid/polymorphism/multischema/output
+++ b/tests/cxx/hybrid/polymorphism/multischema/test-000.std
diff --git a/tests/cxx/hybrid/polymorphism/multischema/test.xml b/tests/cxx/hybrid/polymorphism/multischema/test-000.xml
index d6e3e43..d6e3e43 100644
--- a/tests/cxx/hybrid/polymorphism/multischema/test.xml
+++ b/tests/cxx/hybrid/polymorphism/multischema/test-000.xml
diff --git a/tests/cxx/hybrid/recursive/makefile b/tests/cxx/hybrid/recursive/makefile
index 240299b..b7975b6 100644
--- a/tests/cxx/hybrid/recursive/makefile
+++ b/tests/cxx/hybrid/recursive/makefile
@@ -55,8 +55,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 -ubB $(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/hybrid/recursive/output b/tests/cxx/hybrid/recursive/test-000.std
index 6b89789..6b89789 100644
--- a/tests/cxx/hybrid/recursive/output
+++ b/tests/cxx/hybrid/recursive/test-000.std
diff --git a/tests/cxx/hybrid/recursive/test.xml b/tests/cxx/hybrid/recursive/test-000.xml
index 4db2950..4db2950 100644
--- a/tests/cxx/hybrid/recursive/test.xml
+++ b/tests/cxx/hybrid/recursive/test-000.xml
diff --git a/tests/cxx/hybrid/test-template/makefile b/tests/cxx/hybrid/test-template/makefile
index 28c2b1a..f4a22ed 100644
--- a/tests/cxx/hybrid/test-template/makefile
+++ b/tests/cxx/hybrid/test-template/makefile
@@ -55,8 +55,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 -ubB $(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/hybrid/test-template/output b/tests/cxx/hybrid/test-template/test-000.std
index 66261f6..66261f6 100644
--- a/tests/cxx/hybrid/test-template/output
+++ b/tests/cxx/hybrid/test-template/test-000.std
diff --git a/tests/cxx/hybrid/test-template/test.xml b/tests/cxx/hybrid/test-template/test-000.xml
index 1b7571e..1b7571e 100644
--- a/tests/cxx/hybrid/test-template/test.xml
+++ b/tests/cxx/hybrid/test-template/test-000.xml
diff --git a/tests/cxx/hybrid/union/makefile b/tests/cxx/hybrid/union/makefile
index 9038c4f..e3ff63e 100644
--- a/tests/cxx/hybrid/union/makefile
+++ b/tests/cxx/hybrid/union/makefile
@@ -55,8 +55,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 -ubB $(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/hybrid/union/output b/tests/cxx/hybrid/union/test-000.std
index 9748083..9748083 100644
--- a/tests/cxx/hybrid/union/output
+++ b/tests/cxx/hybrid/union/test-000.std
diff --git a/tests/cxx/hybrid/union/test.xml b/tests/cxx/hybrid/union/test-000.xml
index a2218b2..a2218b2 100644
--- a/tests/cxx/hybrid/union/test.xml
+++ b/tests/cxx/hybrid/union/test-000.xml
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
diff --git a/tests/cxx/serializer/all/makefile b/tests/cxx/serializer/all/makefile
index 6dd097f..260cc30 100644
--- a/tests/cxx/serializer/all/makefile
+++ b/tests/cxx/serializer/all/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/serializer/all/output b/tests/cxx/serializer/all/test-000.std
index ec04b95..ec04b95 100644
--- a/tests/cxx/serializer/all/output
+++ b/tests/cxx/serializer/all/test-000.std
diff --git a/tests/cxx/serializer/choice/makefile b/tests/cxx/serializer/choice/makefile
index d2f363b..964345a 100644
--- a/tests/cxx/serializer/choice/makefile
+++ b/tests/cxx/serializer/choice/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/serializer/choice/output b/tests/cxx/serializer/choice/test-000.std
index 78a615a..78a615a 100644
--- a/tests/cxx/serializer/choice/output
+++ b/tests/cxx/serializer/choice/test-000.std
diff --git a/tests/cxx/serializer/complex/makefile b/tests/cxx/serializer/complex/makefile
index c1c6c70..fddcbc4 100644
--- a/tests/cxx/serializer/complex/makefile
+++ b/tests/cxx/serializer/complex/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/serializer/complex/output b/tests/cxx/serializer/complex/test-000.std
index 82a19b6..82a19b6 100644
--- a/tests/cxx/serializer/complex/output
+++ b/tests/cxx/serializer/complex/test-000.std
diff --git a/tests/cxx/serializer/enumeration/makefile b/tests/cxx/serializer/enumeration/makefile
index 981acbc..33e5594 100644
--- a/tests/cxx/serializer/enumeration/makefile
+++ b/tests/cxx/serializer/enumeration/makefile
@@ -44,8 +44,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/serializer/enumeration/output b/tests/cxx/serializer/enumeration/test-000.std
index 4907042..4907042 100644
--- a/tests/cxx/serializer/enumeration/output
+++ b/tests/cxx/serializer/enumeration/test-000.std
diff --git a/tests/cxx/serializer/error-handling/codes/makefile b/tests/cxx/serializer/error-handling/codes/makefile
index e3a95b6..3985a4b 100644
--- a/tests/cxx/serializer/error-handling/codes/makefile
+++ b/tests/cxx/serializer/error-handling/codes/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/serializer/error-handling/codes/output b/tests/cxx/serializer/error-handling/codes/test-000.std
index c01aab9..c01aab9 100644
--- a/tests/cxx/serializer/error-handling/codes/output
+++ b/tests/cxx/serializer/error-handling/codes/test-000.std
diff --git a/tests/cxx/serializer/error-handling/exceptions/makefile b/tests/cxx/serializer/error-handling/exceptions/makefile
index 3175690..eed922f 100644
--- a/tests/cxx/serializer/error-handling/exceptions/makefile
+++ b/tests/cxx/serializer/error-handling/exceptions/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/serializer/error-handling/exceptions/output b/tests/cxx/serializer/error-handling/exceptions/test-000.std
index e640bd6..e640bd6 100644
--- a/tests/cxx/serializer/error-handling/exceptions/output
+++ b/tests/cxx/serializer/error-handling/exceptions/test-000.std
diff --git a/tests/cxx/serializer/generated-driver/makefile b/tests/cxx/serializer/generated-driver/makefile
index 44e41db..0e043b2 100644
--- a/tests/cxx/serializer/generated-driver/makefile
+++ b/tests/cxx/serializer/generated-driver/makefile
@@ -43,8 +43,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/serializer/generated-driver/output b/tests/cxx/serializer/generated-driver/test-000.std
index d544e67..d544e67 100644
--- a/tests/cxx/serializer/generated-driver/output
+++ b/tests/cxx/serializer/generated-driver/test-000.std
diff --git a/tests/cxx/serializer/list/makefile b/tests/cxx/serializer/list/makefile
index 12c913c..cef767c 100644
--- a/tests/cxx/serializer/list/makefile
+++ b/tests/cxx/serializer/list/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/serializer/list/output b/tests/cxx/serializer/list/test-000.std
index c1ef004..c1ef004 100644
--- a/tests/cxx/serializer/list/output
+++ b/tests/cxx/serializer/list/test-000.std
diff --git a/tests/cxx/serializer/polymorphism/makefile b/tests/cxx/serializer/polymorphism/makefile
index 4e39343..d13f8c8 100644
--- a/tests/cxx/serializer/polymorphism/makefile
+++ b/tests/cxx/serializer/polymorphism/makefile
@@ -42,8 +42,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/serializer/polymorphism/output b/tests/cxx/serializer/polymorphism/test-000.std
index 5107439..5107439 100644
--- a/tests/cxx/serializer/polymorphism/output
+++ b/tests/cxx/serializer/polymorphism/test-000.std
diff --git a/tests/cxx/serializer/recursive/makefile b/tests/cxx/serializer/recursive/makefile
index 2f9da28..7000f22 100644
--- a/tests/cxx/serializer/recursive/makefile
+++ b/tests/cxx/serializer/recursive/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/serializer/recursive/output b/tests/cxx/serializer/recursive/test-000.std
index 717654f..717654f 100644
--- a/tests/cxx/serializer/recursive/output
+++ b/tests/cxx/serializer/recursive/test-000.std
diff --git a/tests/cxx/serializer/reset/makefile b/tests/cxx/serializer/reset/makefile
index af6a994..7906a09 100644
--- a/tests/cxx/serializer/reset/makefile
+++ b/tests/cxx/serializer/reset/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/serializer/reset/output b/tests/cxx/serializer/reset/test-000.std
index 8e0b569..8e0b569 100644
--- a/tests/cxx/serializer/reset/output
+++ b/tests/cxx/serializer/reset/test-000.std
diff --git a/tests/cxx/serializer/restriction/makefile b/tests/cxx/serializer/restriction/makefile
index 8993324..3b738f0 100644
--- a/tests/cxx/serializer/restriction/makefile
+++ b/tests/cxx/serializer/restriction/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/serializer/restriction/output b/tests/cxx/serializer/restriction/test-000.std
index 6cb29b4..6cb29b4 100644
--- a/tests/cxx/serializer/restriction/output
+++ b/tests/cxx/serializer/restriction/test-000.std
diff --git a/tests/cxx/serializer/sequence/makefile b/tests/cxx/serializer/sequence/makefile
index 713a332..6c33dba 100644
--- a/tests/cxx/serializer/sequence/makefile
+++ b/tests/cxx/serializer/sequence/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/serializer/sequence/output b/tests/cxx/serializer/sequence/test-000.std
index a76f191..a76f191 100644
--- a/tests/cxx/serializer/sequence/output
+++ b/tests/cxx/serializer/sequence/test-000.std
diff --git a/tests/cxx/serializer/test-template/makefile b/tests/cxx/serializer/test-template/makefile
index b0fafaf..295fbf5 100644
--- a/tests/cxx/serializer/test-template/makefile
+++ b/tests/cxx/serializer/test-template/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/serializer/test-template/output b/tests/cxx/serializer/test-template/test-000.std
index 509a8ed..509a8ed 100644
--- a/tests/cxx/serializer/test-template/output
+++ b/tests/cxx/serializer/test-template/test-000.std
diff --git a/tests/cxx/serializer/union/makefile b/tests/cxx/serializer/union/makefile
index 20c0453..24a007d 100644
--- a/tests/cxx/serializer/union/makefile
+++ b/tests/cxx/serializer/union/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/serializer/union/output b/tests/cxx/serializer/union/test-000.std
index 70363b0..70363b0 100644
--- a/tests/cxx/serializer/union/output
+++ b/tests/cxx/serializer/union/test-000.std
diff --git a/tests/cxx/serializer/validation/any/makefile b/tests/cxx/serializer/validation/any/makefile
index 5ad09eb..53e61cb 100644
--- a/tests/cxx/serializer/validation/any/makefile
+++ b/tests/cxx/serializer/validation/any/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/serializer/validation/any/output b/tests/cxx/serializer/validation/any/test-000.std
index cf16193..cf16193 100644
--- a/tests/cxx/serializer/validation/any/output
+++ b/tests/cxx/serializer/validation/any/test-000.std
diff --git a/tests/cxx/serializer/validation/attribute/driver.cxx b/tests/cxx/serializer/validation/attribute/driver.cxx
index 96a4629..977a61b 100644
--- a/tests/cxx/serializer/validation/attribute/driver.cxx
+++ b/tests/cxx/serializer/validation/attribute/driver.cxx
@@ -17,7 +17,11 @@ using namespace test;
 struct test_1_simpl: virtual test_1_sskel
 {
   test_1_simpl (int state)
-      : state_ (state)
+      :
+#ifdef XSDE_REUSE_STYLE_TIEIN
+      test_1_sskel (0),
+#endif
+      state_ (state)
   {
   }
 
diff --git a/tests/cxx/serializer/validation/attribute/makefile b/tests/cxx/serializer/validation/attribute/makefile
index e3553fe..4fafac8 100644
--- a/tests/cxx/serializer/validation/attribute/makefile
+++ b/tests/cxx/serializer/validation/attribute/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/serializer/validation/attribute/output b/tests/cxx/serializer/validation/attribute/test-000.std
index 2b9de1e..2b9de1e 100644
--- a/tests/cxx/serializer/validation/attribute/output
+++ b/tests/cxx/serializer/validation/attribute/test-000.std
diff --git a/tests/cxx/serializer/validation/choice/makefile b/tests/cxx/serializer/validation/choice/makefile
index b264038..1ab62d6 100644
--- a/tests/cxx/serializer/validation/choice/makefile
+++ b/tests/cxx/serializer/validation/choice/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/serializer/validation/choice/output b/tests/cxx/serializer/validation/choice/test-000.std
index 7ec90f4..7ec90f4 100644
--- a/tests/cxx/serializer/validation/choice/output
+++ b/tests/cxx/serializer/validation/choice/test-000.std
diff --git a/tests/cxx/serializer/validation/element/makefile b/tests/cxx/serializer/validation/element/makefile
index 04d64f2..7c061d0 100644
--- a/tests/cxx/serializer/validation/element/makefile
+++ b/tests/cxx/serializer/validation/element/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/serializer/validation/element/output b/tests/cxx/serializer/validation/element/test-000.std
index e8e09d0..e8e09d0 100644
--- a/tests/cxx/serializer/validation/element/output
+++ b/tests/cxx/serializer/validation/element/test-000.std
diff --git a/tests/cxx/serializer/validation/sequence/makefile b/tests/cxx/serializer/validation/sequence/makefile
index 55611cd..5667564 100644
--- a/tests/cxx/serializer/validation/sequence/makefile
+++ b/tests/cxx/serializer/validation/sequence/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/serializer/validation/sequence/output b/tests/cxx/serializer/validation/sequence/test-000.std
index 3333a0c..3333a0c 100644
--- a/tests/cxx/serializer/validation/sequence/output
+++ b/tests/cxx/serializer/validation/sequence/test-000.std
diff --git a/tests/cxx/serializer/wildcard/driver.cxx b/tests/cxx/serializer/wildcard/driver.cxx
index 195c6a0..942fdad 100644
--- a/tests/cxx/serializer/wildcard/driver.cxx
+++ b/tests/cxx/serializer/wildcard/driver.cxx
@@ -31,6 +31,13 @@ struct content_simpl: virtual content_sskel
 
 struct root_simpl: virtual root_sskel
 {
+#ifdef XSDE_REUSE_STYLE_TIEIN
+  root_simpl ()
+      : root_sskel (0)
+  {
+  }
+#endif
+
   virtual void
   pre ()
   {
diff --git a/tests/cxx/serializer/wildcard/makefile b/tests/cxx/serializer/wildcard/makefile
index dfde14b..1a5e2e9 100644
--- a/tests/cxx/serializer/wildcard/makefile
+++ b/tests/cxx/serializer/wildcard/makefile
@@ -41,8 +41,8 @@ $(out_base)/: $(driver)
 # Test.
 #
 $(test): driver := $(driver)
-$(test): $(driver) $(src_base)/output
-	$(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver))
+$(test): $(driver) $(src_base)/test-000.std
+	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
 # Clean.
 #
diff --git a/tests/cxx/serializer/wildcard/output b/tests/cxx/serializer/wildcard/test-000.std
index a55bc57..a55bc57 100644
--- a/tests/cxx/serializer/wildcard/output
+++ b/tests/cxx/serializer/wildcard/test-000.std