Make the tests more uniform

44 files changed, 54 insertions, 43 deletions

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