Make the tests more uniform

34 files changed, 22 insertions, 22 deletions

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