Make the tests more uniform

11 files changed, 15 insertions, 11 deletions

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