Add tests to the distribution

The distribution makefiles for tests are automatically generated by
the build/dist script. nmakefiles are not yet generated.

12 files changed, 215 insertions, 41 deletions

diff --git a/tests/cxx/serializer/validation/any/makefile b/tests/cxx/serializer/validation/any/makefile
index 53e61cb..3d848d5 100644
--- a/tests/cxx/serializer/validation/any/makefile
+++ b/tests/cxx/serializer/validation/any/makefile
@@ -14,9 +14,11 @@ dep := $(obj:.o=.o.d)
 xsde.l             := $(out_root)/libxsde/xsde/xsde.l
 xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options
 
-driver := $(out_base)/driver
-test   := $(out_base)/.test
-clean  := $(out_base)/.clean
+driver   := $(out_base)/driver
+test     := $(out_base)/.test
+dist     := $(out_base)/.dist
+dist-win := $(out_base)/.dist-win
+clean    := $(out_base)/.clean
 
 
 # Build.
@@ -30,6 +32,7 @@ skel  := $(addprefix $(out_base)/,$(skelf))
 
 $(skel): xsde := $(out_root)/xsde/xsde
 $(skel): $(out_root)/xsde/xsde
+$(skel) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep))
 
@@ -44,6 +47,19 @@ $(test): driver := $(driver)
 $(test): $(driver) $(src_base)/test-000.std
 	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
+
+# Dist.
+#
+$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
+-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+
+$(dist):
+	$(call message,install $(src_base),$(scf_root)/dist $(opt))
+
+$(dist-win):
+	$(call message,install $(src_base),$(scf_root)/dist -win $(opt))
+
+
 # Clean.
 #
 $(clean): $(driver).o.clean                                \
diff --git a/tests/cxx/serializer/validation/attribute/makefile b/tests/cxx/serializer/validation/attribute/makefile
index 4fafac8..9763ed8 100644
--- a/tests/cxx/serializer/validation/attribute/makefile
+++ b/tests/cxx/serializer/validation/attribute/makefile
@@ -14,9 +14,11 @@ dep := $(obj:.o=.o.d)
 xsde.l             := $(out_root)/libxsde/xsde/xsde.l
 xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options
 
-driver := $(out_base)/driver
-test   := $(out_base)/.test
-clean  := $(out_base)/.clean
+driver   := $(out_base)/driver
+test     := $(out_base)/.test
+dist     := $(out_base)/.dist
+dist-win := $(out_base)/.dist-win
+clean    := $(out_base)/.clean
 
 
 # Build.
@@ -30,6 +32,7 @@ skel  := $(addprefix $(out_base)/,$(skelf))
 
 $(skel): xsde := $(out_root)/xsde/xsde
 $(skel): $(out_root)/xsde/xsde
+$(skel) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep))
 
@@ -44,6 +47,19 @@ $(test): driver := $(driver)
 $(test): $(driver) $(src_base)/test-000.std
 	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
+
+# Dist.
+#
+$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
+-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+
+$(dist):
+	$(call message,install $(src_base),$(scf_root)/dist $(opt))
+
+$(dist-win):
+	$(call message,install $(src_base),$(scf_root)/dist -win $(opt))
+
+
 # Clean.
 #
 $(clean): $(driver).o.clean                                \
diff --git a/tests/cxx/serializer/validation/built-in/date-time/makefile b/tests/cxx/serializer/validation/built-in/date-time/makefile
index 7a8eaa6..1d069a1 100644
--- a/tests/cxx/serializer/validation/built-in/date-time/makefile
+++ b/tests/cxx/serializer/validation/built-in/date-time/makefile
@@ -13,9 +13,11 @@ dep := $(obj:.o=.o.d)
 xsde.l             := $(out_root)/libxsde/xsde/xsde.l
 xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options
 
-driver := $(out_base)/driver
-test   := $(out_base)/.test
-clean  := $(out_base)/.clean
+driver   := $(out_base)/driver
+test     := $(out_base)/.test
+dist     := $(out_base)/.dist
+dist-win := $(out_base)/.dist-win
+clean    := $(out_base)/.clean
 
 
 # Build.
@@ -37,6 +39,18 @@ $(test): driver := $(driver)
 $(test): $(driver)
 	$(call message,test $$1,$$1,$(driver))
 
+
+# Dist.
+#
+$(dist) $(dist-win): opt := -src $(src_base) -cxx "$(cxx)" -out $(dist_prefix)
+
+$(dist):
+	$(call message,install $(src_base),$(scf_root)/dist $(opt))
+
+$(dist-win):
+	$(call message,install $(src_base),$(scf_root)/dist -win $(opt))
+
+
 # Clean.
 #
 $(clean): $(driver).o.clean                                \
diff --git a/tests/cxx/serializer/validation/built-in/decimal/makefile b/tests/cxx/serializer/validation/built-in/decimal/makefile
index eed1012..e893e78 100644
--- a/tests/cxx/serializer/validation/built-in/decimal/makefile
+++ b/tests/cxx/serializer/validation/built-in/decimal/makefile
@@ -13,9 +13,11 @@ dep := $(obj:.o=.o.d)
 xsde.l             := $(out_root)/libxsde/xsde/xsde.l
 xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options
 
-driver := $(out_base)/driver
-test   := $(out_base)/.test
-clean  := $(out_base)/.clean
+driver   := $(out_base)/driver
+test     := $(out_base)/.test
+dist     := $(out_base)/.dist
+dist-win := $(out_base)/.dist-win
+clean    := $(out_base)/.clean
 
 
 # Build.
@@ -37,6 +39,18 @@ $(test): driver := $(driver)
 $(test): $(driver)
 	$(call message,test $$1,$$1,$(driver))
 
+
+# Dist.
+#
+$(dist) $(dist-win): opt := -src $(src_base) -cxx "$(cxx)" -out $(dist_prefix)
+
+$(dist):
+	$(call message,install $(src_base),$(scf_root)/dist $(opt))
+
+$(dist-win):
+	$(call message,install $(src_base),$(scf_root)/dist -win $(opt))
+
+
 # Clean.
 #
 $(clean): $(driver).o.clean                                \
diff --git a/tests/cxx/serializer/validation/built-in/integer/makefile b/tests/cxx/serializer/validation/built-in/integer/makefile
index 72e5152..00b11af 100644
--- a/tests/cxx/serializer/validation/built-in/integer/makefile
+++ b/tests/cxx/serializer/validation/built-in/integer/makefile
@@ -13,9 +13,11 @@ dep := $(obj:.o=.o.d)
 xsde.l             := $(out_root)/libxsde/xsde/xsde.l
 xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options
 
-driver := $(out_base)/driver
-test   := $(out_base)/.test
-clean  := $(out_base)/.clean
+driver   := $(out_base)/driver
+test     := $(out_base)/.test
+dist     := $(out_base)/.dist
+dist-win := $(out_base)/.dist-win
+clean    := $(out_base)/.clean
 
 
 # Build.
@@ -37,6 +39,18 @@ $(test): driver := $(driver)
 $(test): $(driver)
 	$(call message,test $$1,$$1,$(driver))
 
+
+# Dist.
+#
+$(dist) $(dist-win): opt := -src $(src_base) -cxx "$(cxx)" -out $(dist_prefix)
+
+$(dist):
+	$(call message,install $(src_base),$(scf_root)/dist $(opt))
+
+$(dist-win):
+	$(call message,install $(src_base),$(scf_root)/dist -win $(opt))
+
+
 # Clean.
 #
 $(clean): $(driver).o.clean                                \
diff --git a/tests/cxx/serializer/validation/built-in/makefile b/tests/cxx/serializer/validation/built-in/makefile
index 7ea3cd4..99b8603 100644
--- a/tests/cxx/serializer/validation/built-in/makefile
+++ b/tests/cxx/serializer/validation/built-in/makefile
@@ -5,14 +5,26 @@
 
 include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make
 
-tests := date-time decimal integer qname string
+# NOTE: remember to update dist/tests/cxx/serializer/validation/built-in/
+# {makefile,nmakefile} if you change anything here.
+#
+
+all_tests := date-time decimal integer qname string
+build_tests := date-time decimal integer qname string
 
 default   := $(out_base)/
 test      := $(out_base)/.test
+dist      := $(out_base)/.dist
+dist-win  := $(out_base)/.dist-win
 clean     := $(out_base)/.clean
 
-$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests)))
-$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests)))
-$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests)))
+$(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_tests)))
+$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(build_tests)))
+$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests)))
+$(dist-win): $(addprefix $(out_base)/,$(addsuffix /.dist-win,$(all_tests)))
 
-$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile))
+ifneq ($(filter $(MAKECMDGOALS),dist dist-win),)
+$(foreach t,$(all_tests),$(call import,$(src_base)/$t/makefile))
+else
+$(foreach t,$(build_tests),$(call import,$(src_base)/$t/makefile))
+endif
diff --git a/tests/cxx/serializer/validation/built-in/qname/makefile b/tests/cxx/serializer/validation/built-in/qname/makefile
index 025dab3..3dd483c 100644
--- a/tests/cxx/serializer/validation/built-in/qname/makefile
+++ b/tests/cxx/serializer/validation/built-in/qname/makefile
@@ -13,9 +13,11 @@ dep := $(obj:.o=.o.d)
 xsde.l             := $(out_root)/libxsde/xsde/xsde.l
 xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options
 
-driver := $(out_base)/driver
-test   := $(out_base)/.test
-clean  := $(out_base)/.clean
+driver   := $(out_base)/driver
+test     := $(out_base)/.test
+dist     := $(out_base)/.dist
+dist-win := $(out_base)/.dist-win
+clean    := $(out_base)/.clean
 
 
 # Build.
@@ -37,6 +39,18 @@ $(test): driver := $(driver)
 $(test): $(driver)
 	$(call message,test $$1,$$1,$(driver))
 
+
+# Dist.
+#
+$(dist) $(dist-win): opt := -src $(src_base) -cxx "$(cxx)" -out $(dist_prefix)
+
+$(dist):
+	$(call message,install $(src_base),$(scf_root)/dist $(opt))
+
+$(dist-win):
+	$(call message,install $(src_base),$(scf_root)/dist -win $(opt))
+
+
 # Clean.
 #
 $(clean): $(driver).o.clean                                \
diff --git a/tests/cxx/serializer/validation/built-in/string/makefile b/tests/cxx/serializer/validation/built-in/string/makefile
index b51efbb..7e2deb4 100644
--- a/tests/cxx/serializer/validation/built-in/string/makefile
+++ b/tests/cxx/serializer/validation/built-in/string/makefile
@@ -13,9 +13,11 @@ dep := $(obj:.o=.o.d)
 xsde.l             := $(out_root)/libxsde/xsde/xsde.l
 xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options
 
-driver := $(out_base)/driver
-test   := $(out_base)/.test
-clean  := $(out_base)/.clean
+driver   := $(out_base)/driver
+test     := $(out_base)/.test
+dist     := $(out_base)/.dist
+dist-win := $(out_base)/.dist-win
+clean    := $(out_base)/.clean
 
 
 # Build.
@@ -38,6 +40,17 @@ $(test): $(driver)
 	$(call message,test $$1,$$1,$(driver))
 
 
+# Dist.
+#
+$(dist) $(dist-win): opt := -src $(src_base) -cxx "$(cxx)" -out $(dist_prefix)
+
+$(dist):
+	$(call message,install $(src_base),$(scf_root)/dist $(opt))
+
+$(dist-win):
+	$(call message,install $(src_base),$(scf_root)/dist -win $(opt))
+
+
 # Clean.
 #
 $(clean): $(driver).o.clean                                \
diff --git a/tests/cxx/serializer/validation/choice/makefile b/tests/cxx/serializer/validation/choice/makefile
index 1ab62d6..4e95726 100644
--- a/tests/cxx/serializer/validation/choice/makefile
+++ b/tests/cxx/serializer/validation/choice/makefile
@@ -14,9 +14,11 @@ dep := $(obj:.o=.o.d)
 xsde.l             := $(out_root)/libxsde/xsde/xsde.l
 xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options
 
-driver := $(out_base)/driver
-test   := $(out_base)/.test
-clean  := $(out_base)/.clean
+driver   := $(out_base)/driver
+test     := $(out_base)/.test
+dist     := $(out_base)/.dist
+dist-win := $(out_base)/.dist-win
+clean    := $(out_base)/.clean
 
 
 # Build.
@@ -30,6 +32,7 @@ skel  := $(addprefix $(out_base)/,$(skelf))
 
 $(skel): xsde := $(out_root)/xsde/xsde
 $(skel): $(out_root)/xsde/xsde
+$(skel) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep))
 
@@ -44,6 +47,19 @@ $(test): driver := $(driver)
 $(test): $(driver) $(src_base)/test-000.std
 	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
+
+# Dist.
+#
+$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
+-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+
+$(dist):
+	$(call message,install $(src_base),$(scf_root)/dist $(opt))
+
+$(dist-win):
+	$(call message,install $(src_base),$(scf_root)/dist -win $(opt))
+
+
 # Clean.
 #
 $(clean): $(driver).o.clean                                \
diff --git a/tests/cxx/serializer/validation/element/makefile b/tests/cxx/serializer/validation/element/makefile
index 7c061d0..b8166b9 100644
--- a/tests/cxx/serializer/validation/element/makefile
+++ b/tests/cxx/serializer/validation/element/makefile
@@ -14,9 +14,11 @@ dep := $(obj:.o=.o.d)
 xsde.l             := $(out_root)/libxsde/xsde/xsde.l
 xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options
 
-driver := $(out_base)/driver
-test   := $(out_base)/.test
-clean  := $(out_base)/.clean
+driver   := $(out_base)/driver
+test     := $(out_base)/.test
+dist     := $(out_base)/.dist
+dist-win := $(out_base)/.dist-win
+clean    := $(out_base)/.clean
 
 
 # Build.
@@ -30,6 +32,7 @@ skel  := $(addprefix $(out_base)/,$(skelf))
 
 $(skel): xsde := $(out_root)/xsde/xsde
 $(skel): $(out_root)/xsde/xsde
+$(skel) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep))
 
@@ -44,6 +47,19 @@ $(test): driver := $(driver)
 $(test): $(driver) $(src_base)/test-000.std
 	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
+
+# Dist.
+#
+$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
+-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+
+$(dist):
+	$(call message,install $(src_base),$(scf_root)/dist $(opt))
+
+$(dist-win):
+	$(call message,install $(src_base),$(scf_root)/dist -win $(opt))
+
+
 # Clean.
 #
 $(clean): $(driver).o.clean                                \
diff --git a/tests/cxx/serializer/validation/makefile b/tests/cxx/serializer/validation/makefile
index f72083e..f6408a4 100644
--- a/tests/cxx/serializer/validation/makefile
+++ b/tests/cxx/serializer/validation/makefile
@@ -5,18 +5,31 @@
 
 include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
 
-tests := built-in
+# NOTE: remember to update dist/tests/cxx/serializer/validation/{makefile,
+# nmakefile} if you change anything here.
+#
+
+all_tests := built-in any attribute choice element sequence
+
+build_tests := built-in
 
 ifeq ($(xsde_iostream),y)
-tests += any attribute choice element sequence
+build_tests += any attribute choice element sequence
 endif
 
 default   := $(out_base)/
 test      := $(out_base)/.test
+dist      := $(out_base)/.dist
+dist-win  := $(out_base)/.dist-win
 clean     := $(out_base)/.clean
 
-$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests)))
-$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests)))
-$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests)))
+$(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_tests)))
+$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(build_tests)))
+$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests)))
+$(dist-win): $(addprefix $(out_base)/,$(addsuffix /.dist-win,$(all_tests)))
 
-$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile))
+ifneq ($(filter $(MAKECMDGOALS),dist dist-win),)
+$(foreach t,$(all_tests),$(call import,$(src_base)/$t/makefile))
+else
+$(foreach t,$(build_tests),$(call import,$(src_base)/$t/makefile))
+endif
diff --git a/tests/cxx/serializer/validation/sequence/makefile b/tests/cxx/serializer/validation/sequence/makefile
index 5667564..014eec3 100644
--- a/tests/cxx/serializer/validation/sequence/makefile
+++ b/tests/cxx/serializer/validation/sequence/makefile
@@ -14,9 +14,11 @@ dep := $(obj:.o=.o.d)
 xsde.l             := $(out_root)/libxsde/xsde/xsde.l
 xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options
 
-driver := $(out_base)/driver
-test   := $(out_base)/.test
-clean  := $(out_base)/.clean
+driver   := $(out_base)/driver
+test     := $(out_base)/.test
+dist     := $(out_base)/.dist
+dist-win := $(out_base)/.dist-win
+clean    := $(out_base)/.clean
 
 
 # Build.
@@ -30,6 +32,7 @@ skel  := $(addprefix $(out_base)/,$(skelf))
 
 $(skel): xsde := $(out_root)/xsde/xsde
 $(skel): $(out_root)/xsde/xsde
+$(skel) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep))
 
@@ -44,6 +47,19 @@ $(test): driver := $(driver)
 $(test): $(driver) $(src_base)/test-000.std
 	$(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver))
 
+
+# Dist.
+#
+$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
+-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+
+$(dist):
+	$(call message,install $(src_base),$(scf_root)/dist $(opt))
+
+$(dist-win):
+	$(call message,install $(src_base),$(scf_root)/dist -win $(opt))
+
+
 # Clean.
 #
 $(clean): $(driver).o.clean                                \