summaryrefslogtreecommitdiff
path: root/xsd-tests
diff options
context:
space:
mode:
Diffstat (limited to 'xsd-tests')
-rw-r--r--xsd-tests/.gitignore6
-rw-r--r--xsd-tests/README8
-rw-r--r--xsd-tests/README.md4
-rw-r--r--xsd-tests/build/root.build47
-rw-r--r--xsd-tests/buildfile2
-rw-r--r--xsd-tests/clash/buildfile4
-rw-r--r--xsd-tests/clash/driver.cxx3
-rw-r--r--xsd-tests/code/name-conflict/buildfile4
-rw-r--r--xsd-tests/code/name-conflict/driver.cxx3
-rw-r--r--xsd-tests/code/name-escaping/buildfile4
-rw-r--r--xsd-tests/code/name-escaping/driver.cxx3
-rw-r--r--xsd-tests/cxx/parser/built-in/buildfile4
-rw-r--r--xsd-tests/cxx/parser/built-in/driver.cxx3
-rw-r--r--xsd-tests/cxx/parser/enumeration/buildfile4
-rw-r--r--xsd-tests/cxx/parser/enumeration/driver.cxx3
-rw-r--r--xsd-tests/cxx/parser/generated-impl/buildfile4
-rw-r--r--xsd-tests/cxx/parser/list/buildfile4
-rw-r--r--xsd-tests/cxx/parser/list/driver.cxx3
-rw-r--r--xsd-tests/cxx/parser/name-clash/inheritance/buildfile4
-rw-r--r--xsd-tests/cxx/parser/name-clash/inheritance/driver.cxx3
-rw-r--r--xsd-tests/cxx/parser/polymorphism/recursive/buildfile4
-rw-r--r--xsd-tests/cxx/parser/polymorphism/recursive/driver.cxx3
-rw-r--r--xsd-tests/cxx/parser/polymorphism/recursive/test-pimpl.cxx3
-rw-r--r--xsd-tests/cxx/parser/polymorphism/same-type/buildfile4
-rw-r--r--xsd-tests/cxx/parser/polymorphism/same-type/driver.cxx3
-rw-r--r--xsd-tests/cxx/parser/recursive/buildfile4
-rw-r--r--xsd-tests/cxx/parser/recursive/driver.cxx3
-rw-r--r--xsd-tests/cxx/parser/test-template/buildfile4
-rw-r--r--xsd-tests/cxx/parser/test-template/driver.cxx3
-rw-r--r--xsd-tests/cxx/parser/union/buildfile4
-rw-r--r--xsd-tests/cxx/parser/union/driver.cxx3
-rw-r--r--xsd-tests/cxx/parser/validation/all/buildfile4
-rw-r--r--xsd-tests/cxx/parser/validation/all/driver.cxx3
-rw-r--r--xsd-tests/cxx/parser/validation/any/buildfile4
-rw-r--r--xsd-tests/cxx/parser/validation/any/driver.cxx5
-rw-r--r--xsd-tests/cxx/parser/validation/attribute/buildfile4
-rw-r--r--xsd-tests/cxx/parser/validation/attribute/driver.cxx3
-rw-r--r--xsd-tests/cxx/parser/validation/built-in/any-type/buildfile4
-rw-r--r--xsd-tests/cxx/parser/validation/built-in/any-type/driver.cxx5
-rw-r--r--xsd-tests/cxx/parser/validation/built-in/binary/driver.cxx5
-rw-r--r--xsd-tests/cxx/parser/validation/built-in/boolean/driver.cxx5
-rw-r--r--xsd-tests/cxx/parser/validation/built-in/byte/driver.cxx5
-rw-r--r--xsd-tests/cxx/parser/validation/built-in/date-time/driver.cxx5
-rw-r--r--xsd-tests/cxx/parser/validation/built-in/float/driver.cxx4
-rw-r--r--xsd-tests/cxx/parser/validation/built-in/int/driver.cxx5
-rw-r--r--xsd-tests/cxx/parser/validation/built-in/integer/driver.cxx4
-rw-r--r--xsd-tests/cxx/parser/validation/built-in/long/driver.cxx5
-rw-r--r--xsd-tests/cxx/parser/validation/built-in/qname/driver.cxx5
-rw-r--r--xsd-tests/cxx/parser/validation/built-in/short/driver.cxx5
-rw-r--r--xsd-tests/cxx/parser/validation/built-in/string/driver.cxx4
-rw-r--r--xsd-tests/cxx/parser/validation/built-in/uri/driver.cxx5
-rw-r--r--xsd-tests/cxx/parser/validation/choice/buildfile4
-rw-r--r--xsd-tests/cxx/parser/validation/choice/driver.cxx3
-rw-r--r--xsd-tests/cxx/parser/validation/restriction/buildfile4
-rw-r--r--xsd-tests/cxx/parser/validation/restriction/driver.cxx3
-rw-r--r--xsd-tests/cxx/parser/validation/sequence/buildfile4
-rw-r--r--xsd-tests/cxx/parser/validation/sequence/driver.cxx5
-rw-r--r--xsd-tests/cxx/tree/any-type/buildfile4
-rw-r--r--xsd-tests/cxx/tree/any-type/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/binary/cdr/buildfile4
-rw-r--r--xsd-tests/cxx/tree/binary/cdr/driver.cxx4
-rw-r--r--xsd-tests/cxx/tree/binary/polymorphic/buildfile4
-rw-r--r--xsd-tests/cxx/tree/binary/polymorphic/driver.cxx4
-rw-r--r--xsd-tests/cxx/tree/binary/xdr-ordered/buildfile4
-rw-r--r--xsd-tests/cxx/tree/binary/xdr-ordered/driver.cxx4
-rw-r--r--xsd-tests/cxx/tree/binary/xdr/buildfile4
-rw-r--r--xsd-tests/cxx/tree/binary/xdr/driver.cxx4
-rw-r--r--xsd-tests/cxx/tree/built-in/buildfile4
-rw-r--r--xsd-tests/cxx/tree/built-in/driver.cxx4
-rw-r--r--xsd-tests/cxx/tree/chameleon/buildfile4
-rw-r--r--xsd-tests/cxx/tree/chameleon/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/comparison/buildfile4
-rw-r--r--xsd-tests/cxx/tree/comparison/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/compilation/buildfile4
-rw-r--r--xsd-tests/cxx/tree/compilation/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/complex/ctor/buildfile4
-rw-r--r--xsd-tests/cxx/tree/complex/ctor/driver.cxx4
-rw-r--r--xsd-tests/cxx/tree/containment/buildfile4
-rw-r--r--xsd-tests/cxx/tree/containment/driver.cxx4
-rw-r--r--xsd-tests/cxx/tree/default/general/buildfile4
-rw-r--r--xsd-tests/cxx/tree/default/general/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/default/omit/buildfile4
-rw-r--r--xsd-tests/cxx/tree/default/omit/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/detach/buildfile4
-rw-r--r--xsd-tests/cxx/tree/detach/driver.cxx4
-rw-r--r--xsd-tests/cxx/tree/dom-association/buildfile4
-rw-r--r--xsd-tests/cxx/tree/dom-association/dom-parse.cxx3
-rw-r--r--xsd-tests/cxx/tree/dom-association/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/encoding/char/iso-8859-1/buildfile4
-rw-r--r--xsd-tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/encoding/char/lcp/buildfile4
-rw-r--r--xsd-tests/cxx/tree/encoding/char/lcp/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/encoding/char/utf-8/buildfile4
-rw-r--r--xsd-tests/cxx/tree/encoding/char/utf-8/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/encoding/wchar/buildfile4
-rw-r--r--xsd-tests/cxx/tree/encoding/wchar/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/enumeration/ctor/buildfile4
-rw-r--r--xsd-tests/cxx/tree/enumeration/ctor/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/enumeration/inheritance/buildfile4
-rw-r--r--xsd-tests/cxx/tree/enumeration/inheritance/driver.cxx4
-rw-r--r--xsd-tests/cxx/tree/float/buildfile4
-rw-r--r--xsd-tests/cxx/tree/float/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/list/ctor/buildfile4
-rw-r--r--xsd-tests/cxx/tree/list/ctor/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/name-clash/inheritance/buildfile4
-rw-r--r--xsd-tests/cxx/tree/name-clash/inheritance/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/naming/camel/buildfile4
-rw-r--r--xsd-tests/cxx/tree/naming/camel/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/naming/java/buildfile4
-rw-r--r--xsd-tests/cxx/tree/naming/java/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/naming/knr/buildfile4
-rw-r--r--xsd-tests/cxx/tree/naming/knr/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/order/buildfile4
-rw-r--r--xsd-tests/cxx/tree/order/driver.cxx4
-rw-r--r--xsd-tests/cxx/tree/polymorphism/comparison/buildfile4
-rw-r--r--xsd-tests/cxx/tree/polymorphism/comparison/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/polymorphism/ostream/buildfile4
-rw-r--r--xsd-tests/cxx/tree/polymorphism/ostream/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/polymorphism/same-type/buildfile4
-rw-r--r--xsd-tests/cxx/tree/polymorphism/same-type/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/prefix/buildfile4
-rw-r--r--xsd-tests/cxx/tree/prefix/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/test-template/buildfile4
-rw-r--r--xsd-tests/cxx/tree/test-template/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/types-only/buildfile4
-rw-r--r--xsd-tests/cxx/tree/types-only/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/union/ctor/buildfile4
-rw-r--r--xsd-tests/cxx/tree/union/ctor/driver.cxx3
-rw-r--r--xsd-tests/cxx/tree/wildcard/buildfile4
-rw-r--r--xsd-tests/cxx/tree/wildcard/driver.cxx3
-rw-r--r--xsd-tests/failed/buildfile4
-rw-r--r--xsd-tests/failed/driver.cxx3
-rw-r--r--xsd-tests/manifest16
-rw-r--r--xsd-tests/morphing/anonymous/attribute-group/buildfile4
-rw-r--r--xsd-tests/morphing/anonymous/attribute-group/driver.cxx3
-rw-r--r--xsd-tests/morphing/anonymous/basic/buildfile4
-rw-r--r--xsd-tests/morphing/anonymous/basic/driver.cxx3
-rw-r--r--xsd-tests/morphing/anonymous/cyclic-inclusion/buildfile4
-rw-r--r--xsd-tests/morphing/anonymous/cyclic-inclusion/driver.cxx3
-rw-r--r--xsd-tests/morphing/anonymous/group/buildfile4
-rw-r--r--xsd-tests/morphing/anonymous/group/driver.cxx3
-rw-r--r--xsd-tests/morphing/anonymous/unstable/buildfile6
-rw-r--r--xsd-tests/processing/inheritance/buildfile4
-rw-r--r--xsd-tests/processing/inheritance/driver.cxx.in3
-rw-r--r--xsd-tests/schema/anonymous/buildfile4
-rw-r--r--xsd-tests/schema/anonymous/driver.cxx3
-rw-r--r--xsd-tests/schema/any-attribute/buildfile2
-rw-r--r--xsd-tests/schema/any-type/buildfile4
-rw-r--r--xsd-tests/schema/any-type/driver.cxx3
-rw-r--r--xsd-tests/schema/any/buildfile8
-rw-r--r--xsd-tests/schema/any/driver.cxx.in3
-rw-r--r--xsd-tests/schema/attribute-group/buildfile4
-rw-r--r--xsd-tests/schema/attribute-group/driver.cxx3
-rw-r--r--xsd-tests/schema/attribute/buildfile4
-rw-r--r--xsd-tests/schema/attribute/driver.cxx3
-rw-r--r--xsd-tests/schema/cardinality/buildfile4
-rw-r--r--xsd-tests/schema/cardinality/driver.cxx3
-rw-r--r--xsd-tests/schema/chameleon/buildfile4
-rw-r--r--xsd-tests/schema/chameleon/driver.cxx3
-rw-r--r--xsd-tests/schema/enumeration/buildfile4
-rw-r--r--xsd-tests/schema/enumeration/driver.cxx3
-rw-r--r--xsd-tests/schema/forward/buildfile4
-rw-r--r--xsd-tests/schema/forward/driver.cxx3
-rw-r--r--xsd-tests/schema/group/buildfile4
-rw-r--r--xsd-tests/schema/group/driver.cxx3
-rw-r--r--xsd-tests/schema/import/buildfile4
-rw-r--r--xsd-tests/schema/import/driver.cxx3
-rw-r--r--xsd-tests/schema/include/buildfile4
-rw-r--r--xsd-tests/schema/include/driver.cxx3
-rw-r--r--xsd-tests/schema/inheritance/buildfile6
-rw-r--r--xsd-tests/schema/list/buildfile6
-rw-r--r--xsd-tests/schema/no-namespace/buildfile4
-rw-r--r--xsd-tests/schema/no-namespace/driver.cxx3
-rw-r--r--xsd-tests/schema/recursive/buildfile4
-rw-r--r--xsd-tests/schema/recursive/driver.cxx3
-rw-r--r--xsd-tests/schema/ref-type/invalid/buildfile2
-rw-r--r--xsd-tests/schema/ref-type/valid/buildfile4
-rw-r--r--xsd-tests/schema/ref-type/valid/driver.cxx.in3
-rw-r--r--xsd-tests/schema/restriction/buildfile4
-rw-r--r--xsd-tests/schema/restriction/driver.cxx3
-rw-r--r--xsd-tests/schema/union/buildfile4
-rw-r--r--xsd-tests/schema/union/driver.cxx3
182 files changed, 412 insertions, 326 deletions
diff --git a/xsd-tests/.gitignore b/xsd-tests/.gitignore
index d87c74c..2d3e43c 100644
--- a/xsd-tests/.gitignore
+++ b/xsd-tests/.gitignore
@@ -3,10 +3,16 @@
*.d
*.t
*.i
+*.i.*
*.ii
+*.ii.*
*.o
*.obj
+*.gcm
+*.pcm
+*.ifc
*.so
+*.dylib
*.dll
*.a
*.lib
diff --git a/xsd-tests/README b/xsd-tests/README
deleted file mode 100644
index 1b529ab..0000000
--- a/xsd-tests/README
+++ /dev/null
@@ -1,8 +0,0 @@
-This package contains tests for the XSD to C++ data binding compiler.
-
-See the LICENSE file for distribution conditions.
-
-The project page is at https://www.codesynthesis.com/projects/xsd/.
-
-Send bug reports or any other feedback to the xsd-users@codesynthesis.com
-mailing list.
diff --git a/xsd-tests/README.md b/xsd-tests/README.md
new file mode 100644
index 0000000..409c447
--- /dev/null
+++ b/xsd-tests/README.md
@@ -0,0 +1,4 @@
+# xsd-tests - tests for XSD compiler
+
+This package contains tests for `xsd`, the XML Schema to C++ data binding
+compiler.
diff --git a/xsd-tests/build/root.build b/xsd-tests/build/root.build
index 63c3bb4..258d4eb 100644
--- a/xsd-tests/build/root.build
+++ b/xsd-tests/build/root.build
@@ -1,15 +1,6 @@
# file : build/root.build
# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-define xsd: file
-xsd{*}: extension = xsd
-
-define xml: file
-xml{*}: extension = xml
-
-define map: file
-map{*}: extension = map
-
using in
cxx.std = latest
@@ -21,20 +12,32 @@ ixx{*}: extension = ixx
txx{*}: extension = txx
cxx{*}: extension = cxx
-if ($cxx.target.system == 'win32-msvc')
- cxx.poptions += -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
+if ($build.mode != 'skeleton')
+{
+ define xsd: file
+ xsd{*}: extension = xsd
+
+ define xml: file
+ xml{*}: extension = xml
+
+ define map: file
+ map{*}: extension = map
+
+ if ($cxx.target.system == 'win32-msvc')
+ cxx.poptions += -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
-if ($cxx.class == 'msvc')
- cxx.coptions += /wd4251 /wd4275 /wd4800
+ if ($cxx.class == 'msvc')
+ cxx.coptions += /wd4251 /wd4275 /wd4800
-# Setup the xsd that we are testing.
-#
-import xsd = xsd%exe{xsd}
+ # Import xsd that we are testing.
+ #
+ import! [metadata] xsd = xsd%exe{xsd}
-# Every exe{} in this project is by default a test.
-#
-exe{*}: test = true
+ # Every exe{} in this project is by default a test.
+ #
+ exe{*}: test = true
-# Specify the test target for cross-testing.
-#
-test.target = $cxx.target
+ # Specify the test target for cross-testing.
+ #
+ test.target = $cxx.target
+}
diff --git a/xsd-tests/buildfile b/xsd-tests/buildfile
index e783791..7259a1f 100644
--- a/xsd-tests/buildfile
+++ b/xsd-tests/buildfile
@@ -1,4 +1,4 @@
# file : buildfile
# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-./: {*/ -build/} doc{README} legal{GPLv2 LICENSE FLOSSE} manifest
+./: {*/ -build/} doc{README.md} legal{GPLv2 LICENSE FLOSSE} manifest
diff --git a/xsd-tests/clash/buildfile b/xsd-tests/clash/buildfile
index e99dccf..b87d6aa 100644
--- a/xsd-tests/clash/buildfile
+++ b/xsd-tests/clash/buildfile
@@ -15,9 +15,7 @@ for f: $fs
{
<{hxx cxx}{$f}>: xsd{$f} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
diff --git a/xsd-tests/clash/driver.cxx b/xsd-tests/clash/driver.cxx
index 478e71a..c8fd0ed 100644
--- a/xsd-tests/clash/driver.cxx
+++ b/xsd-tests/clash/driver.cxx
@@ -4,6 +4,9 @@
#include "foo.hxx"
#include "clash.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/code/name-conflict/buildfile b/xsd-tests/code/name-conflict/buildfile
index 3a724f9..03051a5 100644
--- a/xsd-tests/code/name-conflict/buildfile
+++ b/xsd-tests/code/name-conflict/buildfile
@@ -11,9 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
<{hxx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
diff --git a/xsd-tests/code/name-conflict/driver.cxx b/xsd-tests/code/name-conflict/driver.cxx
index a6eb4fe..55763df 100644
--- a/xsd-tests/code/name-conflict/driver.cxx
+++ b/xsd-tests/code/name-conflict/driver.cxx
@@ -3,6 +3,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/code/name-escaping/buildfile b/xsd-tests/code/name-escaping/buildfile
index c252afd..debfe58 100644
--- a/xsd-tests/code/name-escaping/buildfile
+++ b/xsd-tests/code/name-escaping/buildfile
@@ -11,9 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
<{hxx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
diff --git a/xsd-tests/code/name-escaping/driver.cxx b/xsd-tests/code/name-escaping/driver.cxx
index 8d74030..dcfb967 100644
--- a/xsd-tests/code/name-escaping/driver.cxx
+++ b/xsd-tests/code/name-escaping/driver.cxx
@@ -3,6 +3,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/cxx/parser/built-in/buildfile b/xsd-tests/cxx/parser/built-in/buildfile
index 0522c9a..13ae128 100644
--- a/xsd-tests/cxx/parser/built-in/buildfile
+++ b/xsd-tests/cxx/parser/built-in/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-parser --std c++11 \
+ $xsd cxx-parser \
--generate-inline \
--skel-file-suffix -pskel \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/parser/built-in/driver.cxx b/xsd-tests/cxx/parser/built-in/driver.cxx
index 008bc2d..aab2f19 100644
--- a/xsd-tests/cxx/parser/built-in/driver.cxx
+++ b/xsd-tests/cxx/parser/built-in/driver.cxx
@@ -9,6 +9,9 @@
#include "test-pskel.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
using xml_schema::ro_string;
diff --git a/xsd-tests/cxx/parser/enumeration/buildfile b/xsd-tests/cxx/parser/enumeration/buildfile
index 05163df..fe5933a 100644
--- a/xsd-tests/cxx/parser/enumeration/buildfile
+++ b/xsd-tests/cxx/parser/enumeration/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test-pskel}>: xsd{test} map{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-parser --std c++11 \
+ $xsd cxx-parser \
--generate-inline \
--skel-file-suffix -pskel \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/parser/enumeration/driver.cxx b/xsd-tests/cxx/parser/enumeration/driver.cxx
index 4776ee2..d5488f7 100644
--- a/xsd-tests/cxx/parser/enumeration/driver.cxx
+++ b/xsd-tests/cxx/parser/enumeration/driver.cxx
@@ -9,6 +9,9 @@
#include "test-pskel.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace xml_schema;
diff --git a/xsd-tests/cxx/parser/generated-impl/buildfile b/xsd-tests/cxx/parser/generated-impl/buildfile
index 8710a77..f6932f9 100644
--- a/xsd-tests/cxx/parser/generated-impl/buildfile
+++ b/xsd-tests/cxx/parser/generated-impl/buildfile
@@ -16,9 +16,7 @@ exe{driver}: file{output}: test.stdout = true
{hxx cxx}{test-pimpl} \
{ cxx}{test-driver}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-parser --std c++11 \
+ $xsd cxx-parser \
--generate-inline \
--skel-file-suffix -pskel \
--generate-print-impl \
diff --git a/xsd-tests/cxx/parser/list/buildfile b/xsd-tests/cxx/parser/list/buildfile
index 426101e..5f44a93 100644
--- a/xsd-tests/cxx/parser/list/buildfile
+++ b/xsd-tests/cxx/parser/list/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-parser --std c++11 \
+ $xsd cxx-parser \
--generate-inline \
--skel-file-suffix -pskel \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/parser/list/driver.cxx b/xsd-tests/cxx/parser/list/driver.cxx
index 382da5b..42d3255 100644
--- a/xsd-tests/cxx/parser/list/driver.cxx
+++ b/xsd-tests/cxx/parser/list/driver.cxx
@@ -9,6 +9,9 @@
#include "test-pskel.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/parser/name-clash/inheritance/buildfile b/xsd-tests/cxx/parser/name-clash/inheritance/buildfile
index 4bd7b48..d6065be 100644
--- a/xsd-tests/cxx/parser/name-clash/inheritance/buildfile
+++ b/xsd-tests/cxx/parser/name-clash/inheritance/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-parser --std c++11 \
+ $xsd cxx-parser \
--generate-inline \
--skel-file-suffix -pskel \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/parser/name-clash/inheritance/driver.cxx b/xsd-tests/cxx/parser/name-clash/inheritance/driver.cxx
index 9e9b905..cdb2b22 100644
--- a/xsd-tests/cxx/parser/name-clash/inheritance/driver.cxx
+++ b/xsd-tests/cxx/parser/name-clash/inheritance/driver.cxx
@@ -9,6 +9,9 @@
#include "test-pskel.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/parser/polymorphism/recursive/buildfile b/xsd-tests/cxx/parser/polymorphism/recursive/buildfile
index 629645b..02b1b41 100644
--- a/xsd-tests/cxx/parser/polymorphism/recursive/buildfile
+++ b/xsd-tests/cxx/parser/polymorphism/recursive/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-parser --std c++11 \
+ $xsd cxx-parser \
--generate-inline \
--skel-file-suffix -pskel \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/parser/polymorphism/recursive/driver.cxx b/xsd-tests/cxx/parser/polymorphism/recursive/driver.cxx
index 26793a0..4e7ffde 100644
--- a/xsd-tests/cxx/parser/polymorphism/recursive/driver.cxx
+++ b/xsd-tests/cxx/parser/polymorphism/recursive/driver.cxx
@@ -10,6 +10,9 @@
#include "test-pskel.hxx"
#include "test-pimpl.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/parser/polymorphism/recursive/test-pimpl.cxx b/xsd-tests/cxx/parser/polymorphism/recursive/test-pimpl.cxx
index 7c7f410..ba44859 100644
--- a/xsd-tests/cxx/parser/polymorphism/recursive/test-pimpl.cxx
+++ b/xsd-tests/cxx/parser/polymorphism/recursive/test-pimpl.cxx
@@ -5,6 +5,9 @@
#include "test-pimpl.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
namespace test
diff --git a/xsd-tests/cxx/parser/polymorphism/same-type/buildfile b/xsd-tests/cxx/parser/polymorphism/same-type/buildfile
index d98e917..4303002 100644
--- a/xsd-tests/cxx/parser/polymorphism/same-type/buildfile
+++ b/xsd-tests/cxx/parser/polymorphism/same-type/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-parser --std c++11 \
+ $xsd cxx-parser \
--generate-inline \
--skel-file-suffix -pskel \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/parser/polymorphism/same-type/driver.cxx b/xsd-tests/cxx/parser/polymorphism/same-type/driver.cxx
index 6da4a0a..cf0180b 100644
--- a/xsd-tests/cxx/parser/polymorphism/same-type/driver.cxx
+++ b/xsd-tests/cxx/parser/polymorphism/same-type/driver.cxx
@@ -9,6 +9,9 @@
#include "test-pskel.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/parser/recursive/buildfile b/xsd-tests/cxx/parser/recursive/buildfile
index 237855c..395908e 100644
--- a/xsd-tests/cxx/parser/recursive/buildfile
+++ b/xsd-tests/cxx/parser/recursive/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-parser --std c++11 \
+ $xsd cxx-parser \
--generate-inline \
--skel-file-suffix -pskel \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/parser/recursive/driver.cxx b/xsd-tests/cxx/parser/recursive/driver.cxx
index c93fd35..0877dfc 100644
--- a/xsd-tests/cxx/parser/recursive/driver.cxx
+++ b/xsd-tests/cxx/parser/recursive/driver.cxx
@@ -9,6 +9,9 @@
#include "test-pskel.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
struct sub_pimpl: sub_type_pskel
diff --git a/xsd-tests/cxx/parser/test-template/buildfile b/xsd-tests/cxx/parser/test-template/buildfile
index 9f7f5d3..aad21e7 100644
--- a/xsd-tests/cxx/parser/test-template/buildfile
+++ b/xsd-tests/cxx/parser/test-template/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-parser --std c++11 \
+ $xsd cxx-parser \
--generate-inline \
--skel-file-suffix -pskel \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/parser/test-template/driver.cxx b/xsd-tests/cxx/parser/test-template/driver.cxx
index 333c6fd..74c8c99 100644
--- a/xsd-tests/cxx/parser/test-template/driver.cxx
+++ b/xsd-tests/cxx/parser/test-template/driver.cxx
@@ -9,6 +9,9 @@
#include "test-pskel.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/parser/union/buildfile b/xsd-tests/cxx/parser/union/buildfile
index 1a8615c..6694d5f 100644
--- a/xsd-tests/cxx/parser/union/buildfile
+++ b/xsd-tests/cxx/parser/union/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-parser --std c++11 \
+ $xsd cxx-parser \
--generate-inline \
--skel-file-suffix -pskel \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/parser/union/driver.cxx b/xsd-tests/cxx/parser/union/driver.cxx
index c5b5c71..d133b41 100644
--- a/xsd-tests/cxx/parser/union/driver.cxx
+++ b/xsd-tests/cxx/parser/union/driver.cxx
@@ -9,6 +9,9 @@
#include "test-pskel.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/parser/validation/all/buildfile b/xsd-tests/cxx/parser/validation/all/buildfile
index 555843e..e9c0550 100644
--- a/xsd-tests/cxx/parser/validation/all/buildfile
+++ b/xsd-tests/cxx/parser/validation/all/buildfile
@@ -9,9 +9,7 @@ exe{driver}: {hxx cxx}{* -test-pskel} {hxx ixx cxx}{test-pskel} $libs \
<{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-parser --std c++11 \
+ $xsd cxx-parser \
--generate-inline \
--skel-file-suffix -pskel \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/parser/validation/all/driver.cxx b/xsd-tests/cxx/parser/validation/all/driver.cxx
index a8cbcca..31081cb 100644
--- a/xsd-tests/cxx/parser/validation/all/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/all/driver.cxx
@@ -10,6 +10,9 @@
#include "test-pskel.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/parser/validation/any/buildfile b/xsd-tests/cxx/parser/validation/any/buildfile
index 57135f4..9867f51 100644
--- a/xsd-tests/cxx/parser/validation/any/buildfile
+++ b/xsd-tests/cxx/parser/validation/any/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-parser --std c++11 \
+ $xsd cxx-parser \
--generate-inline \
--skel-file-suffix -pskel \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/parser/validation/any/driver.cxx b/xsd-tests/cxx/parser/validation/any/driver.cxx
index 1eceda6..2f22d37 100644
--- a/xsd-tests/cxx/parser/validation/any/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/any/driver.cxx
@@ -10,6 +10,9 @@
#include "test-pskel.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
using xml_schema::ro_string;
@@ -35,7 +38,7 @@ struct any_a_pimpl: any_a_pskel
}
virtual void
- _start_any_element (ro_string const&,
+ _start_any_element (ro_string const&,
ro_string const& n,
ro_string const*)
{
diff --git a/xsd-tests/cxx/parser/validation/attribute/buildfile b/xsd-tests/cxx/parser/validation/attribute/buildfile
index d486193..0dfe365 100644
--- a/xsd-tests/cxx/parser/validation/attribute/buildfile
+++ b/xsd-tests/cxx/parser/validation/attribute/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-parser --std c++11 \
+ $xsd cxx-parser \
--generate-inline \
--skel-file-suffix -pskel \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/parser/validation/attribute/driver.cxx b/xsd-tests/cxx/parser/validation/attribute/driver.cxx
index 4710564..a98796e 100644
--- a/xsd-tests/cxx/parser/validation/attribute/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/attribute/driver.cxx
@@ -10,6 +10,9 @@
#include "test-pskel.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
using xml_schema::ro_string;
diff --git a/xsd-tests/cxx/parser/validation/built-in/any-type/buildfile b/xsd-tests/cxx/parser/validation/built-in/any-type/buildfile
index a6f366b..8efcacc 100644
--- a/xsd-tests/cxx/parser/validation/built-in/any-type/buildfile
+++ b/xsd-tests/cxx/parser/validation/built-in/any-type/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-parser --std c++11 \
+ $xsd cxx-parser \
--generate-inline \
--skel-file-suffix -pskel \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/parser/validation/built-in/any-type/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/any-type/driver.cxx
index cbeb864..35b3927 100644
--- a/xsd-tests/cxx/parser/validation/built-in/any-type/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/any-type/driver.cxx
@@ -10,6 +10,9 @@
#include "test-pskel.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
using xml_schema::ro_string;
@@ -23,7 +26,7 @@ struct any_type_pimpl: xml_schema::any_type_pimpl
}
virtual void
- _start_any_element (ro_string const&,
+ _start_any_element (ro_string const&,
ro_string const& n,
ro_string const*)
{
diff --git a/xsd-tests/cxx/parser/validation/built-in/binary/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/binary/driver.cxx
index 3fe20ec..b3f0dbf 100644
--- a/xsd-tests/cxx/parser/validation/built-in/binary/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/binary/driver.cxx
@@ -3,11 +3,12 @@
// Test the built-in base64Binary and hexBinary types validation.
//
-#include <cassert>
-
#include <xsd/cxx/parser/validating/exceptions.hxx>
#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
+#undef NDEBUG
+#include <cassert>
+
using namespace xsd::cxx::parser::validating;
template <typename T>
diff --git a/xsd-tests/cxx/parser/validation/built-in/boolean/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/boolean/driver.cxx
index f1499cd..3b25ffe 100644
--- a/xsd-tests/cxx/parser/validation/built-in/boolean/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/boolean/driver.cxx
@@ -3,11 +3,12 @@
// Test the built-in boolean type validation.
//
-#include <cassert>
-
#include <xsd/cxx/parser/validating/exceptions.hxx>
#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
+#undef NDEBUG
+#include <cassert>
+
using namespace xsd::cxx::parser::validating;
bool
diff --git a/xsd-tests/cxx/parser/validation/built-in/byte/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/byte/driver.cxx
index b533cfd..9b0e9a1 100644
--- a/xsd-tests/cxx/parser/validation/built-in/byte/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/byte/driver.cxx
@@ -3,11 +3,12 @@
// Test the built-in byte and unsigned byte types validation.
//
-#include <cassert>
-
#include <xsd/cxx/parser/validating/exceptions.hxx>
#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
+#undef NDEBUG
+#include <cassert>
+
using namespace xsd::cxx::parser::validating;
template <typename T>
diff --git a/xsd-tests/cxx/parser/validation/built-in/date-time/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/date-time/driver.cxx
index da02a50..36f384f 100644
--- a/xsd-tests/cxx/parser/validation/built-in/date-time/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/date-time/driver.cxx
@@ -3,11 +3,12 @@
// Test the built-in date and time types validation.
//
-#include <cassert>
-
#include <xsd/cxx/parser/validating/exceptions.hxx>
#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
+#undef NDEBUG
+#include <cassert>
+
using namespace xsd::cxx::parser::validating;
template <typename T>
diff --git a/xsd-tests/cxx/parser/validation/built-in/float/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/float/driver.cxx
index e92c419..87a744d 100644
--- a/xsd-tests/cxx/parser/validation/built-in/float/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/float/driver.cxx
@@ -4,11 +4,13 @@
// Test the built-in float, double, and decimal types validation.
//
#include <math.h>
-#include <cassert>
#include <xsd/cxx/parser/validating/exceptions.hxx>
#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
+#undef NDEBUG
+#include <cassert>
+
using namespace xsd::cxx::parser::validating;
template <typename T>
diff --git a/xsd-tests/cxx/parser/validation/built-in/int/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/int/driver.cxx
index 270cd0e..7e68b35 100644
--- a/xsd-tests/cxx/parser/validation/built-in/int/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/int/driver.cxx
@@ -3,11 +3,12 @@
// Test the built-in int and unsigned int types validation.
//
-#include <cassert>
-
#include <xsd/cxx/parser/validating/exceptions.hxx>
#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
+#undef NDEBUG
+#include <cassert>
+
using namespace xsd::cxx::parser::validating;
template <typename T>
diff --git a/xsd-tests/cxx/parser/validation/built-in/integer/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/integer/driver.cxx
index 3a5fdd5..4f8a80c 100644
--- a/xsd-tests/cxx/parser/validation/built-in/integer/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/integer/driver.cxx
@@ -7,11 +7,13 @@
#include <string>
#include <sstream>
-#include <cassert>
#include <xsd/cxx/parser/validating/exceptions.hxx>
#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace xsd::cxx::parser::validating;
diff --git a/xsd-tests/cxx/parser/validation/built-in/long/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/long/driver.cxx
index a4ab565..41feb0b 100644
--- a/xsd-tests/cxx/parser/validation/built-in/long/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/long/driver.cxx
@@ -3,11 +3,12 @@
// Test the built-in long and unsigned long types validation.
//
-#include <cassert>
-
#include <xsd/cxx/parser/validating/exceptions.hxx>
#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
+#undef NDEBUG
+#include <cassert>
+
using namespace xsd::cxx::parser::validating;
template <typename T>
diff --git a/xsd-tests/cxx/parser/validation/built-in/qname/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/qname/driver.cxx
index 85acd1c..8845b38 100644
--- a/xsd-tests/cxx/parser/validation/built-in/qname/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/qname/driver.cxx
@@ -3,11 +3,12 @@
// Test the built-in QName type validation.
//
-#include <cassert>
-
#include <xsd/cxx/parser/validating/exceptions.hxx>
#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
+#undef NDEBUG
+#include <cassert>
+
using namespace xsd::cxx::parser::validating;
bool
diff --git a/xsd-tests/cxx/parser/validation/built-in/short/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/short/driver.cxx
index 7c79b22..f09f975 100644
--- a/xsd-tests/cxx/parser/validation/built-in/short/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/short/driver.cxx
@@ -3,11 +3,12 @@
// Test the built-in short and unsigned short types validation.
//
-#include <cassert>
-
#include <xsd/cxx/parser/validating/exceptions.hxx>
#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
+#undef NDEBUG
+#include <cassert>
+
using namespace xsd::cxx::parser::validating;
template <typename T>
diff --git a/xsd-tests/cxx/parser/validation/built-in/string/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/string/driver.cxx
index 920385a..d74ee52 100644
--- a/xsd-tests/cxx/parser/validation/built-in/string/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/string/driver.cxx
@@ -4,11 +4,13 @@
// Test the built-in string & friends types validation.
//
#include <string>
-#include <cassert>
#include <xsd/cxx/parser/validating/exceptions.hxx>
#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
+#undef NDEBUG
+#include <cassert>
+
using namespace xsd::cxx::parser::validating;
template <typename T>
diff --git a/xsd-tests/cxx/parser/validation/built-in/uri/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/uri/driver.cxx
index dcc9242..c296858 100644
--- a/xsd-tests/cxx/parser/validation/built-in/uri/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/built-in/uri/driver.cxx
@@ -3,11 +3,12 @@
// Test the built-in anyURI type validation.
//
-#include <cassert>
-
#include <xsd/cxx/parser/validating/exceptions.hxx>
#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
+#undef NDEBUG
+#include <cassert>
+
using namespace xsd::cxx::parser::validating;
int
diff --git a/xsd-tests/cxx/parser/validation/choice/buildfile b/xsd-tests/cxx/parser/validation/choice/buildfile
index adf0832..06eca85 100644
--- a/xsd-tests/cxx/parser/validation/choice/buildfile
+++ b/xsd-tests/cxx/parser/validation/choice/buildfile
@@ -9,9 +9,7 @@ exe{driver}: {hxx cxx}{* -test-pskel} {hxx ixx cxx}{test-pskel} $libs \
<{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-parser --std c++11 \
+ $xsd cxx-parser \
--generate-inline \
--skel-file-suffix -pskel \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/parser/validation/choice/driver.cxx b/xsd-tests/cxx/parser/validation/choice/driver.cxx
index 4a52c5d..edfb15d 100644
--- a/xsd-tests/cxx/parser/validation/choice/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/choice/driver.cxx
@@ -10,6 +10,9 @@
#include "test-pskel.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
using xml_schema::ro_string;
diff --git a/xsd-tests/cxx/parser/validation/restriction/buildfile b/xsd-tests/cxx/parser/validation/restriction/buildfile
index 4c415bf..1086ea0 100644
--- a/xsd-tests/cxx/parser/validation/restriction/buildfile
+++ b/xsd-tests/cxx/parser/validation/restriction/buildfile
@@ -9,9 +9,7 @@ exe{driver}: {hxx cxx}{* -test-pskel} {hxx ixx cxx}{test-pskel} $libs \
<{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-parser --std c++11 \
+ $xsd cxx-parser \
--generate-inline \
--skel-file-suffix -pskel \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/parser/validation/restriction/driver.cxx b/xsd-tests/cxx/parser/validation/restriction/driver.cxx
index 206b9f8..ea7f192 100644
--- a/xsd-tests/cxx/parser/validation/restriction/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/restriction/driver.cxx
@@ -10,6 +10,9 @@
#include "test-pskel.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/parser/validation/sequence/buildfile b/xsd-tests/cxx/parser/validation/sequence/buildfile
index b205091..2ca2b6a 100644
--- a/xsd-tests/cxx/parser/validation/sequence/buildfile
+++ b/xsd-tests/cxx/parser/validation/sequence/buildfile
@@ -9,9 +9,7 @@ exe{driver}: {hxx cxx}{* -test-pskel} {hxx ixx cxx}{test-pskel} $libs \
<{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-parser --std c++11 \
+ $xsd cxx-parser \
--generate-inline \
--skel-file-suffix -pskel \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/parser/validation/sequence/driver.cxx b/xsd-tests/cxx/parser/validation/sequence/driver.cxx
index 6b5bf70..07d33e2 100644
--- a/xsd-tests/cxx/parser/validation/sequence/driver.cxx
+++ b/xsd-tests/cxx/parser/validation/sequence/driver.cxx
@@ -10,6 +10,9 @@
#include "test-pskel.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
using xml_schema::ro_string;
@@ -59,7 +62,7 @@ struct sequence_pimpl: sequence_pskel
}
virtual void
- _start_any_element (ro_string const& ns,
+ _start_any_element (ro_string const& ns,
ro_string const& name,
ro_string const*)
{
diff --git a/xsd-tests/cxx/tree/any-type/buildfile b/xsd-tests/cxx/tree/any-type/buildfile
index c65c403..6f3a355 100644
--- a/xsd-tests/cxx/tree/any-type/buildfile
+++ b/xsd-tests/cxx/tree/any-type/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-serialization \
--generate-any-type \
diff --git a/xsd-tests/cxx/tree/any-type/driver.cxx b/xsd-tests/cxx/tree/any-type/driver.cxx
index a8fccf6..8ed00c7 100644
--- a/xsd-tests/cxx/tree/any-type/driver.cxx
+++ b/xsd-tests/cxx/tree/any-type/driver.cxx
@@ -16,6 +16,9 @@
#include <xsd/cxx/xml/string.hxx>
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
using namespace xercesc;
diff --git a/xsd-tests/cxx/tree/binary/cdr/buildfile b/xsd-tests/cxx/tree/binary/cdr/buildfile
index 7a1c5b4..7518f04 100644
--- a/xsd-tests/cxx/tree/binary/cdr/buildfile
+++ b/xsd-tests/cxx/tree/binary/cdr/buildfile
@@ -11,9 +11,7 @@ exe{driver}: xml{test}: test.input = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-insertion 'ACE_OutputCDR' \
--generate-extraction 'ACE_InputCDR' \
diff --git a/xsd-tests/cxx/tree/binary/cdr/driver.cxx b/xsd-tests/cxx/tree/binary/cdr/driver.cxx
index fe74bb5..4656b03 100644
--- a/xsd-tests/cxx/tree/binary/cdr/driver.cxx
+++ b/xsd-tests/cxx/tree/binary/cdr/driver.cxx
@@ -5,11 +5,13 @@
//
#include <memory> // std::auto_ptr/unique_ptr
-#include <cassert>
#include <iostream>
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/binary/polymorphic/buildfile b/xsd-tests/cxx/tree/binary/polymorphic/buildfile
index d34ef27..1212a34 100644
--- a/xsd-tests/cxx/tree/binary/polymorphic/buildfile
+++ b/xsd-tests/cxx/tree/binary/polymorphic/buildfile
@@ -11,9 +11,7 @@ exe{driver}: xml{test}: test.input = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-polymorphic \
--root-element-last \
diff --git a/xsd-tests/cxx/tree/binary/polymorphic/driver.cxx b/xsd-tests/cxx/tree/binary/polymorphic/driver.cxx
index 15ebf17..ebc0dba 100644
--- a/xsd-tests/cxx/tree/binary/polymorphic/driver.cxx
+++ b/xsd-tests/cxx/tree/binary/polymorphic/driver.cxx
@@ -5,7 +5,6 @@
//
#include <memory> // std::auto_ptr/unique_ptr
-#include <cassert>
#include <iostream>
#include <typeinfo>
@@ -13,6 +12,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/binary/xdr-ordered/buildfile b/xsd-tests/cxx/tree/binary/xdr-ordered/buildfile
index 09414c7..93e1701 100644
--- a/xsd-tests/cxx/tree/binary/xdr-ordered/buildfile
+++ b/xsd-tests/cxx/tree/binary/xdr-ordered/buildfile
@@ -13,9 +13,7 @@ exe{driver}: xml{test}: test.input = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-insertion 'XDR' \
--generate-extraction 'XDR' \
diff --git a/xsd-tests/cxx/tree/binary/xdr-ordered/driver.cxx b/xsd-tests/cxx/tree/binary/xdr-ordered/driver.cxx
index d61a645..46a2e1f 100644
--- a/xsd-tests/cxx/tree/binary/xdr-ordered/driver.cxx
+++ b/xsd-tests/cxx/tree/binary/xdr-ordered/driver.cxx
@@ -8,11 +8,13 @@
#include <memory> // std::auto_ptr/unique_ptr
#include <cstring> // std::memcpy
-#include <cassert>
#include <iostream>
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/binary/xdr/buildfile b/xsd-tests/cxx/tree/binary/xdr/buildfile
index b8fc2f4..0c738f6 100644
--- a/xsd-tests/cxx/tree/binary/xdr/buildfile
+++ b/xsd-tests/cxx/tree/binary/xdr/buildfile
@@ -13,9 +13,7 @@ exe{driver}: xml{test}: test.input = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-insertion 'XDR' \
--generate-extraction 'XDR' \
diff --git a/xsd-tests/cxx/tree/binary/xdr/driver.cxx b/xsd-tests/cxx/tree/binary/xdr/driver.cxx
index 04606ea..a497d73 100644
--- a/xsd-tests/cxx/tree/binary/xdr/driver.cxx
+++ b/xsd-tests/cxx/tree/binary/xdr/driver.cxx
@@ -6,11 +6,13 @@
#include <memory> // std::auto_ptr/unique_ptr
#include <cstring> // std::memcpy
-#include <cassert>
#include <iostream>
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/built-in/buildfile b/xsd-tests/cxx/tree/built-in/buildfile
index 8ee8585..5570ff0 100644
--- a/xsd-tests/cxx/tree/built-in/buildfile
+++ b/xsd-tests/cxx/tree/built-in/buildfile
@@ -8,9 +8,7 @@ exe{driver}: {hxx cxx}{* -types} {hxx ixx cxx}{types} $libs testscript
<{hxx ixx cxx}{types}>: xsd{types} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-ostream \
--generate-serialization \
diff --git a/xsd-tests/cxx/tree/built-in/driver.cxx b/xsd-tests/cxx/tree/built-in/driver.cxx
index 4141290..ccb43ac 100644
--- a/xsd-tests/cxx/tree/built-in/driver.cxx
+++ b/xsd-tests/cxx/tree/built-in/driver.cxx
@@ -8,9 +8,11 @@
#include <sstream>
#include <iostream>
-
#include "types.hxx"
+#undef NDEBUG
+#include <cassert>
+
using std::cerr;
using std::endl;
diff --git a/xsd-tests/cxx/tree/chameleon/buildfile b/xsd-tests/cxx/tree/chameleon/buildfile
index cec3b01..c04c4b9 100644
--- a/xsd-tests/cxx/tree/chameleon/buildfile
+++ b/xsd-tests/cxx/tree/chameleon/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{includer}>: xsd{includer includee} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-ostream \
--root-element root \
diff --git a/xsd-tests/cxx/tree/chameleon/driver.cxx b/xsd-tests/cxx/tree/chameleon/driver.cxx
index c22ca55..0d95864 100644
--- a/xsd-tests/cxx/tree/chameleon/driver.cxx
+++ b/xsd-tests/cxx/tree/chameleon/driver.cxx
@@ -9,6 +9,9 @@
#include "includer.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/comparison/buildfile b/xsd-tests/cxx/tree/comparison/buildfile
index 507a703..c1ece3a 100644
--- a/xsd-tests/cxx/tree/comparison/buildfile
+++ b/xsd-tests/cxx/tree/comparison/buildfile
@@ -10,9 +10,7 @@ exe{driver}: xml{test}: test.input = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-comparison \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/tree/comparison/driver.cxx b/xsd-tests/cxx/tree/comparison/driver.cxx
index aa7b66d..36b0647 100644
--- a/xsd-tests/cxx/tree/comparison/driver.cxx
+++ b/xsd-tests/cxx/tree/comparison/driver.cxx
@@ -9,6 +9,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/compilation/buildfile b/xsd-tests/cxx/tree/compilation/buildfile
index bec2b4b..26cf0f0 100644
--- a/xsd-tests/cxx/tree/compilation/buildfile
+++ b/xsd-tests/cxx/tree/compilation/buildfile
@@ -8,9 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-serialization \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/tree/compilation/driver.cxx b/xsd-tests/cxx/tree/compilation/driver.cxx
index 5c5ab39..818cb6b 100644
--- a/xsd-tests/cxx/tree/compilation/driver.cxx
+++ b/xsd-tests/cxx/tree/compilation/driver.cxx
@@ -9,6 +9,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/complex/ctor/buildfile b/xsd-tests/cxx/tree/complex/ctor/buildfile
index 53e32b7..14a4340 100644
--- a/xsd-tests/cxx/tree/complex/ctor/buildfile
+++ b/xsd-tests/cxx/tree/complex/ctor/buildfile
@@ -8,9 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-default-ctor \
--generate-from-base-ctor \
diff --git a/xsd-tests/cxx/tree/complex/ctor/driver.cxx b/xsd-tests/cxx/tree/complex/ctor/driver.cxx
index 7beaa93..7cc25bb 100644
--- a/xsd-tests/cxx/tree/complex/ctor/driver.cxx
+++ b/xsd-tests/cxx/tree/complex/ctor/driver.cxx
@@ -4,7 +4,6 @@
// Test generation of varous complex type constructors.
//
-#include <cassert>
#include <memory>
#include "test.hxx"
@@ -16,6 +15,9 @@
# define XSD_MOVE(x) x
#endif
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/containment/buildfile b/xsd-tests/cxx/tree/containment/buildfile
index 1d0272b..f241817 100644
--- a/xsd-tests/cxx/tree/containment/buildfile
+++ b/xsd-tests/cxx/tree/containment/buildfile
@@ -8,9 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-default-ctor \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/tree/containment/driver.cxx b/xsd-tests/cxx/tree/containment/driver.cxx
index 65c17fc..db8db72 100644
--- a/xsd-tests/cxx/tree/containment/driver.cxx
+++ b/xsd-tests/cxx/tree/containment/driver.cxx
@@ -5,7 +5,6 @@
//
#include <memory> // std::auto_ptr/unique_ptr
-#include <cassert>
#include "test.hxx"
@@ -16,6 +15,9 @@
# define XSD_MOVE(x) x
#endif
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/default/general/buildfile b/xsd-tests/cxx/tree/default/general/buildfile
index 4e482ce..7ccc174 100644
--- a/xsd-tests/cxx/tree/default/general/buildfile
+++ b/xsd-tests/cxx/tree/default/general/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-serialization \
--generate-ostream \
diff --git a/xsd-tests/cxx/tree/default/general/driver.cxx b/xsd-tests/cxx/tree/default/general/driver.cxx
index 7031636..f15a0c7 100644
--- a/xsd-tests/cxx/tree/default/general/driver.cxx
+++ b/xsd-tests/cxx/tree/default/general/driver.cxx
@@ -9,6 +9,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/default/omit/buildfile b/xsd-tests/cxx/tree/default/omit/buildfile
index 407ab1e..ee6d678 100644
--- a/xsd-tests/cxx/tree/default/omit/buildfile
+++ b/xsd-tests/cxx/tree/default/omit/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-serialization \
--generate-ostream \
diff --git a/xsd-tests/cxx/tree/default/omit/driver.cxx b/xsd-tests/cxx/tree/default/omit/driver.cxx
index 3dcc0d8..c7d32c9 100644
--- a/xsd-tests/cxx/tree/default/omit/driver.cxx
+++ b/xsd-tests/cxx/tree/default/omit/driver.cxx
@@ -9,6 +9,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/detach/buildfile b/xsd-tests/cxx/tree/detach/buildfile
index 07f5f03..8a27a2c 100644
--- a/xsd-tests/cxx/tree/detach/buildfile
+++ b/xsd-tests/cxx/tree/detach/buildfile
@@ -8,9 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-detach \
--generate-default-ctor \
diff --git a/xsd-tests/cxx/tree/detach/driver.cxx b/xsd-tests/cxx/tree/detach/driver.cxx
index b632b5d..1d7e1f9 100644
--- a/xsd-tests/cxx/tree/detach/driver.cxx
+++ b/xsd-tests/cxx/tree/detach/driver.cxx
@@ -5,7 +5,6 @@
//
#include <memory> // std::auto_ptr/unique_ptr
-#include <cassert>
#include "test.hxx"
@@ -16,6 +15,9 @@
# define XSD_MOVE(x) x
#endif
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/dom-association/buildfile b/xsd-tests/cxx/tree/dom-association/buildfile
index 85593e5..b6f6e0e 100644
--- a/xsd-tests/cxx/tree/dom-association/buildfile
+++ b/xsd-tests/cxx/tree/dom-association/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-ostream \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/tree/dom-association/dom-parse.cxx b/xsd-tests/cxx/tree/dom-association/dom-parse.cxx
index 281eb2c..a14b8e9 100644
--- a/xsd-tests/cxx/tree/dom-association/dom-parse.cxx
+++ b/xsd-tests/cxx/tree/dom-association/dom-parse.cxx
@@ -15,6 +15,9 @@
#include <xsd/cxx/tree/exceptions.hxx>
#include <xsd/cxx/tree/error-handler.hxx>
+#undef NDEBUG
+#include <cassert>
+
using namespace xercesc;
namespace xml = xsd::cxx::xml;
namespace tree = xsd::cxx::tree;
diff --git a/xsd-tests/cxx/tree/dom-association/driver.cxx b/xsd-tests/cxx/tree/dom-association/driver.cxx
index d85e105..2470212 100644
--- a/xsd-tests/cxx/tree/dom-association/driver.cxx
+++ b/xsd-tests/cxx/tree/dom-association/driver.cxx
@@ -13,6 +13,9 @@
#include "dom-parse.hxx"
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
using namespace xercesc;
diff --git a/xsd-tests/cxx/tree/encoding/char/iso-8859-1/buildfile b/xsd-tests/cxx/tree/encoding/char/iso-8859-1/buildfile
index bdea527..a64f457 100644
--- a/xsd-tests/cxx/tree/encoding/char/iso-8859-1/buildfile
+++ b/xsd-tests/cxx/tree/encoding/char/iso-8859-1/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-serialization \
--char-encoding iso8859-1 \
diff --git a/xsd-tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx b/xsd-tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx
index e356815..9d92c12 100644
--- a/xsd-tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx
+++ b/xsd-tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx
@@ -10,6 +10,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/encoding/char/lcp/buildfile b/xsd-tests/cxx/tree/encoding/char/lcp/buildfile
index d935b09..65d2f16 100644
--- a/xsd-tests/cxx/tree/encoding/char/lcp/buildfile
+++ b/xsd-tests/cxx/tree/encoding/char/lcp/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-serialization \
--char-encoding lcp \
diff --git a/xsd-tests/cxx/tree/encoding/char/lcp/driver.cxx b/xsd-tests/cxx/tree/encoding/char/lcp/driver.cxx
index 97c0875..54f99e6 100644
--- a/xsd-tests/cxx/tree/encoding/char/lcp/driver.cxx
+++ b/xsd-tests/cxx/tree/encoding/char/lcp/driver.cxx
@@ -11,6 +11,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/encoding/char/utf-8/buildfile b/xsd-tests/cxx/tree/encoding/char/utf-8/buildfile
index 4d48165..c4b06b1 100644
--- a/xsd-tests/cxx/tree/encoding/char/utf-8/buildfile
+++ b/xsd-tests/cxx/tree/encoding/char/utf-8/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-serialization \
--generate-doxygen \
diff --git a/xsd-tests/cxx/tree/encoding/char/utf-8/driver.cxx b/xsd-tests/cxx/tree/encoding/char/utf-8/driver.cxx
index 7892667..7f83d2b 100644
--- a/xsd-tests/cxx/tree/encoding/char/utf-8/driver.cxx
+++ b/xsd-tests/cxx/tree/encoding/char/utf-8/driver.cxx
@@ -10,6 +10,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/encoding/wchar/buildfile b/xsd-tests/cxx/tree/encoding/wchar/buildfile
index f640976..cdc8e60 100644
--- a/xsd-tests/cxx/tree/encoding/wchar/buildfile
+++ b/xsd-tests/cxx/tree/encoding/wchar/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-serialization \
--char-type wchar_t \
diff --git a/xsd-tests/cxx/tree/encoding/wchar/driver.cxx b/xsd-tests/cxx/tree/encoding/wchar/driver.cxx
index dbcbcba..f4e7993 100644
--- a/xsd-tests/cxx/tree/encoding/wchar/driver.cxx
+++ b/xsd-tests/cxx/tree/encoding/wchar/driver.cxx
@@ -10,6 +10,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/enumeration/ctor/buildfile b/xsd-tests/cxx/tree/enumeration/ctor/buildfile
index 96be1ce..41a8028 100644
--- a/xsd-tests/cxx/tree/enumeration/ctor/buildfile
+++ b/xsd-tests/cxx/tree/enumeration/ctor/buildfile
@@ -8,9 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-default-ctor \
--generate-from-base-ctor \
diff --git a/xsd-tests/cxx/tree/enumeration/ctor/driver.cxx b/xsd-tests/cxx/tree/enumeration/ctor/driver.cxx
index c5ea1f2..3ea4a28 100644
--- a/xsd-tests/cxx/tree/enumeration/ctor/driver.cxx
+++ b/xsd-tests/cxx/tree/enumeration/ctor/driver.cxx
@@ -7,6 +7,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/enumeration/inheritance/buildfile b/xsd-tests/cxx/tree/enumeration/inheritance/buildfile
index 184c95c..beb0add 100644
--- a/xsd-tests/cxx/tree/enumeration/inheritance/buildfile
+++ b/xsd-tests/cxx/tree/enumeration/inheritance/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-ostream \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/tree/enumeration/inheritance/driver.cxx b/xsd-tests/cxx/tree/enumeration/inheritance/driver.cxx
index b517b1f..d2494c0 100644
--- a/xsd-tests/cxx/tree/enumeration/inheritance/driver.cxx
+++ b/xsd-tests/cxx/tree/enumeration/inheritance/driver.cxx
@@ -5,11 +5,13 @@
//
#include <memory> // std::auto_ptr/unique_ptr
-#include <cassert>
#include <iostream>
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/float/buildfile b/xsd-tests/cxx/tree/float/buildfile
index 4872a2f..92a5937 100644
--- a/xsd-tests/cxx/tree/float/buildfile
+++ b/xsd-tests/cxx/tree/float/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-serialization \
--root-element-all \
diff --git a/xsd-tests/cxx/tree/float/driver.cxx b/xsd-tests/cxx/tree/float/driver.cxx
index 0f7455f..b4409ad 100644
--- a/xsd-tests/cxx/tree/float/driver.cxx
+++ b/xsd-tests/cxx/tree/float/driver.cxx
@@ -10,6 +10,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/list/ctor/buildfile b/xsd-tests/cxx/tree/list/ctor/buildfile
index 2155f95..adb6a13 100644
--- a/xsd-tests/cxx/tree/list/ctor/buildfile
+++ b/xsd-tests/cxx/tree/list/ctor/buildfile
@@ -8,9 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-default-ctor \
--generate-from-base-ctor \
diff --git a/xsd-tests/cxx/tree/list/ctor/driver.cxx b/xsd-tests/cxx/tree/list/ctor/driver.cxx
index 5673e67..f821cdd 100644
--- a/xsd-tests/cxx/tree/list/ctor/driver.cxx
+++ b/xsd-tests/cxx/tree/list/ctor/driver.cxx
@@ -7,6 +7,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/name-clash/inheritance/buildfile b/xsd-tests/cxx/tree/name-clash/inheritance/buildfile
index 530c42f..473d128 100644
--- a/xsd-tests/cxx/tree/name-clash/inheritance/buildfile
+++ b/xsd-tests/cxx/tree/name-clash/inheritance/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-ostream \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/tree/name-clash/inheritance/driver.cxx b/xsd-tests/cxx/tree/name-clash/inheritance/driver.cxx
index 634c56a..ae0d337 100644
--- a/xsd-tests/cxx/tree/name-clash/inheritance/driver.cxx
+++ b/xsd-tests/cxx/tree/name-clash/inheritance/driver.cxx
@@ -9,6 +9,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/naming/camel/buildfile b/xsd-tests/cxx/tree/naming/camel/buildfile
index 8a8410c..d93bd8e 100644
--- a/xsd-tests/cxx/tree/naming/camel/buildfile
+++ b/xsd-tests/cxx/tree/naming/camel/buildfile
@@ -8,9 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-serialization \
--type-naming ucc \
diff --git a/xsd-tests/cxx/tree/naming/camel/driver.cxx b/xsd-tests/cxx/tree/naming/camel/driver.cxx
index 600b3ff..82dddba 100644
--- a/xsd-tests/cxx/tree/naming/camel/driver.cxx
+++ b/xsd-tests/cxx/tree/naming/camel/driver.cxx
@@ -11,6 +11,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/naming/java/buildfile b/xsd-tests/cxx/tree/naming/java/buildfile
index 5d4b447..b23f104 100644
--- a/xsd-tests/cxx/tree/naming/java/buildfile
+++ b/xsd-tests/cxx/tree/naming/java/buildfile
@@ -8,9 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-serialization \
--type-naming java \
diff --git a/xsd-tests/cxx/tree/naming/java/driver.cxx b/xsd-tests/cxx/tree/naming/java/driver.cxx
index b47ff74..4738296 100644
--- a/xsd-tests/cxx/tree/naming/java/driver.cxx
+++ b/xsd-tests/cxx/tree/naming/java/driver.cxx
@@ -11,6 +11,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/naming/knr/buildfile b/xsd-tests/cxx/tree/naming/knr/buildfile
index c4c2287..c694aa2 100644
--- a/xsd-tests/cxx/tree/naming/knr/buildfile
+++ b/xsd-tests/cxx/tree/naming/knr/buildfile
@@ -8,9 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-serialization \
--type-naming knr \
diff --git a/xsd-tests/cxx/tree/naming/knr/driver.cxx b/xsd-tests/cxx/tree/naming/knr/driver.cxx
index 8c75dd9..f959a20 100644
--- a/xsd-tests/cxx/tree/naming/knr/driver.cxx
+++ b/xsd-tests/cxx/tree/naming/knr/driver.cxx
@@ -11,6 +11,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/order/buildfile b/xsd-tests/cxx/tree/order/buildfile
index 91c3cb7..b490676 100644
--- a/xsd-tests/cxx/tree/order/buildfile
+++ b/xsd-tests/cxx/tree/order/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-serialization \
--generate-wildcard \
diff --git a/xsd-tests/cxx/tree/order/driver.cxx b/xsd-tests/cxx/tree/order/driver.cxx
index f1902ba..46a0065 100644
--- a/xsd-tests/cxx/tree/order/driver.cxx
+++ b/xsd-tests/cxx/tree/order/driver.cxx
@@ -5,7 +5,6 @@
//
#include <memory> // std::auto_ptr/unique_ptr
-#include <cassert>
#include <iostream>
#include <xercesc/dom/DOM.hpp>
@@ -13,6 +12,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
using namespace xercesc;
diff --git a/xsd-tests/cxx/tree/polymorphism/comparison/buildfile b/xsd-tests/cxx/tree/polymorphism/comparison/buildfile
index 0bb0b77..fc486ba 100644
--- a/xsd-tests/cxx/tree/polymorphism/comparison/buildfile
+++ b/xsd-tests/cxx/tree/polymorphism/comparison/buildfile
@@ -10,9 +10,7 @@ exe{driver}: xml{test}: test.input = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-serialization \
--generate-polymorphic \
diff --git a/xsd-tests/cxx/tree/polymorphism/comparison/driver.cxx b/xsd-tests/cxx/tree/polymorphism/comparison/driver.cxx
index cadb225..502fa3c 100644
--- a/xsd-tests/cxx/tree/polymorphism/comparison/driver.cxx
+++ b/xsd-tests/cxx/tree/polymorphism/comparison/driver.cxx
@@ -10,6 +10,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/polymorphism/ostream/buildfile b/xsd-tests/cxx/tree/polymorphism/ostream/buildfile
index 2237c73..fb9c4d0 100644
--- a/xsd-tests/cxx/tree/polymorphism/ostream/buildfile
+++ b/xsd-tests/cxx/tree/polymorphism/ostream/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-polymorphic \
--polymorphic-type-all \
diff --git a/xsd-tests/cxx/tree/polymorphism/ostream/driver.cxx b/xsd-tests/cxx/tree/polymorphism/ostream/driver.cxx
index b030be9..8754ac0 100644
--- a/xsd-tests/cxx/tree/polymorphism/ostream/driver.cxx
+++ b/xsd-tests/cxx/tree/polymorphism/ostream/driver.cxx
@@ -9,6 +9,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/polymorphism/same-type/buildfile b/xsd-tests/cxx/tree/polymorphism/same-type/buildfile
index 46720d6..e739925 100644
--- a/xsd-tests/cxx/tree/polymorphism/same-type/buildfile
+++ b/xsd-tests/cxx/tree/polymorphism/same-type/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-polymorphic \
--root-element root \
diff --git a/xsd-tests/cxx/tree/polymorphism/same-type/driver.cxx b/xsd-tests/cxx/tree/polymorphism/same-type/driver.cxx
index 94f82f5..bebd0a1 100644
--- a/xsd-tests/cxx/tree/polymorphism/same-type/driver.cxx
+++ b/xsd-tests/cxx/tree/polymorphism/same-type/driver.cxx
@@ -9,6 +9,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/prefix/buildfile b/xsd-tests/cxx/tree/prefix/buildfile
index 7ac81de..3ecd411 100644
--- a/xsd-tests/cxx/tree/prefix/buildfile
+++ b/xsd-tests/cxx/tree/prefix/buildfile
@@ -15,9 +15,7 @@ for f: $fs
{
<{hxx ixx cxx}{$f}>: xsd{$f} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-serialization \
--generate-polymorphic \
diff --git a/xsd-tests/cxx/tree/prefix/driver.cxx b/xsd-tests/cxx/tree/prefix/driver.cxx
index bd2e46d..4eadf96 100644
--- a/xsd-tests/cxx/tree/prefix/driver.cxx
+++ b/xsd-tests/cxx/tree/prefix/driver.cxx
@@ -9,6 +9,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/test-template/buildfile b/xsd-tests/cxx/tree/test-template/buildfile
index b50e6c3..937840f 100644
--- a/xsd-tests/cxx/tree/test-template/buildfile
+++ b/xsd-tests/cxx/tree/test-template/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-ostream \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/tree/test-template/driver.cxx b/xsd-tests/cxx/tree/test-template/driver.cxx
index 5257279..69c1ed9 100644
--- a/xsd-tests/cxx/tree/test-template/driver.cxx
+++ b/xsd-tests/cxx/tree/test-template/driver.cxx
@@ -9,6 +9,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/types-only/buildfile b/xsd-tests/cxx/tree/types-only/buildfile
index fa02277..6436090 100644
--- a/xsd-tests/cxx/tree/types-only/buildfile
+++ b/xsd-tests/cxx/tree/types-only/buildfile
@@ -8,9 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--suppress-parsing \
--output-dir $out_base \
diff --git a/xsd-tests/cxx/tree/types-only/driver.cxx b/xsd-tests/cxx/tree/types-only/driver.cxx
index 730b807..f9cce83 100644
--- a/xsd-tests/cxx/tree/types-only/driver.cxx
+++ b/xsd-tests/cxx/tree/types-only/driver.cxx
@@ -9,6 +9,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/union/ctor/buildfile b/xsd-tests/cxx/tree/union/ctor/buildfile
index 6715cb6..e1dcb77 100644
--- a/xsd-tests/cxx/tree/union/ctor/buildfile
+++ b/xsd-tests/cxx/tree/union/ctor/buildfile
@@ -8,9 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-default-ctor \
--generate-from-base-ctor \
diff --git a/xsd-tests/cxx/tree/union/ctor/driver.cxx b/xsd-tests/cxx/tree/union/ctor/driver.cxx
index 246eea8..20d03ad 100644
--- a/xsd-tests/cxx/tree/union/ctor/driver.cxx
+++ b/xsd-tests/cxx/tree/union/ctor/driver.cxx
@@ -7,6 +7,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
diff --git a/xsd-tests/cxx/tree/wildcard/buildfile b/xsd-tests/cxx/tree/wildcard/buildfile
index 67edcdc..d936b0f 100644
--- a/xsd-tests/cxx/tree/wildcard/buildfile
+++ b/xsd-tests/cxx/tree/wildcard/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
<{hxx ixx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--generate-inline \
--generate-serialization \
--generate-wildcard \
diff --git a/xsd-tests/cxx/tree/wildcard/driver.cxx b/xsd-tests/cxx/tree/wildcard/driver.cxx
index e3040c7..2847391 100644
--- a/xsd-tests/cxx/tree/wildcard/driver.cxx
+++ b/xsd-tests/cxx/tree/wildcard/driver.cxx
@@ -15,6 +15,9 @@
#include <xsd/cxx/xml/string.hxx>
+#undef NDEBUG
+#include <cassert>
+
using namespace std;
using namespace test;
using namespace xercesc;
diff --git a/xsd-tests/failed/buildfile b/xsd-tests/failed/buildfile
index 8739001..a37056e 100644
--- a/xsd-tests/failed/buildfile
+++ b/xsd-tests/failed/buildfile
@@ -15,9 +15,7 @@ for f: $fs
{
<{hxx cxx}{$f}>: xsd{$f} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
diff --git a/xsd-tests/failed/driver.cxx b/xsd-tests/failed/driver.cxx
index a84b24c..4154f9e 100644
--- a/xsd-tests/failed/driver.cxx
+++ b/xsd-tests/failed/driver.cxx
@@ -3,6 +3,9 @@
#include "test-00.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/manifest b/xsd-tests/manifest
index 23cae47..dc0c5b6 100644
--- a/xsd-tests/manifest
+++ b/xsd-tests/manifest
@@ -1,15 +1,17 @@
: 1
name: xsd-tests
-version: 4.2.0-b.1.z
+version: 4.2.1-a.0.z
project: xsd
+type: tests
+language: c++
summary: XML Schema to C++ data binding compiler tests
license: other: GPL-2.0-only with Xerces-C++ linking exception and FLOSS exception
-description-file: README
-url: https://www.codesynthesis.com/projects/xsd/
-doc-url: https://www.codesynthesis.com/projects/xsd/
-src-url: https://git.codesynthesis.com/cgit/xsd/xsd/tree/xsd-tests/
+description-file: README.md
+url: https://www.codesynthesis.com/products/xsd/
+doc-url: https://www.codesynthesis.com/products/xsd/
+src-url: https://git.codesynthesis.com/cgit/xsd/xsd/
email: xsd-users@codesynthesis.com ; Mailing list
-depends: * build2 >= 0.14.0-
-depends: * bpkg >= 0.14.0-
+depends: * build2 >= 0.16.0
+depends: * bpkg >= 0.16.0
depends: libxsd == $
depends: libxerces-c ^3.0.0
diff --git a/xsd-tests/morphing/anonymous/attribute-group/buildfile b/xsd-tests/morphing/anonymous/attribute-group/buildfile
index 3df24fc..38aa6d8 100644
--- a/xsd-tests/morphing/anonymous/attribute-group/buildfile
+++ b/xsd-tests/morphing/anonymous/attribute-group/buildfile
@@ -11,9 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
<{hxx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
diff --git a/xsd-tests/morphing/anonymous/attribute-group/driver.cxx b/xsd-tests/morphing/anonymous/attribute-group/driver.cxx
index 1632d7d..e2eb296 100644
--- a/xsd-tests/morphing/anonymous/attribute-group/driver.cxx
+++ b/xsd-tests/morphing/anonymous/attribute-group/driver.cxx
@@ -3,6 +3,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/morphing/anonymous/basic/buildfile b/xsd-tests/morphing/anonymous/basic/buildfile
index e2573e7..8193904 100644
--- a/xsd-tests/morphing/anonymous/basic/buildfile
+++ b/xsd-tests/morphing/anonymous/basic/buildfile
@@ -11,9 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
<{hxx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
diff --git a/xsd-tests/morphing/anonymous/basic/driver.cxx b/xsd-tests/morphing/anonymous/basic/driver.cxx
index fc289eb..c3f081a 100644
--- a/xsd-tests/morphing/anonymous/basic/driver.cxx
+++ b/xsd-tests/morphing/anonymous/basic/driver.cxx
@@ -3,6 +3,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/morphing/anonymous/cyclic-inclusion/buildfile b/xsd-tests/morphing/anonymous/cyclic-inclusion/buildfile
index d25143a..15cbbe8 100644
--- a/xsd-tests/morphing/anonymous/cyclic-inclusion/buildfile
+++ b/xsd-tests/morphing/anonymous/cyclic-inclusion/buildfile
@@ -15,9 +15,7 @@ for f: $fs
{
<{hxx cxx}{$f}>: xsd{$f} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
diff --git a/xsd-tests/morphing/anonymous/cyclic-inclusion/driver.cxx b/xsd-tests/morphing/anonymous/cyclic-inclusion/driver.cxx
index 9046ee4..d79f00f 100644
--- a/xsd-tests/morphing/anonymous/cyclic-inclusion/driver.cxx
+++ b/xsd-tests/morphing/anonymous/cyclic-inclusion/driver.cxx
@@ -4,6 +4,9 @@
#include "includee.hxx"
#include "includer.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/morphing/anonymous/group/buildfile b/xsd-tests/morphing/anonymous/group/buildfile
index 9cedf39..980dd19 100644
--- a/xsd-tests/morphing/anonymous/group/buildfile
+++ b/xsd-tests/morphing/anonymous/group/buildfile
@@ -11,9 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
<{hxx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
diff --git a/xsd-tests/morphing/anonymous/group/driver.cxx b/xsd-tests/morphing/anonymous/group/driver.cxx
index 2a76396..23a80e6 100644
--- a/xsd-tests/morphing/anonymous/group/driver.cxx
+++ b/xsd-tests/morphing/anonymous/group/driver.cxx
@@ -3,6 +3,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/morphing/anonymous/unstable/buildfile b/xsd-tests/morphing/anonymous/unstable/buildfile
index e83cee7..d61d36b 100644
--- a/xsd-tests/morphing/anonymous/unstable/buildfile
+++ b/xsd-tests/morphing/anonymous/unstable/buildfile
@@ -11,9 +11,7 @@ for f: $fs
{
<{hxx cxx}{$f}>: xsd{$f} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
@@ -27,5 +25,5 @@ for f: $fs
testscript{*}:
{
test = $xsd
- test.arguments = cxx-tree --std c++11
+ test.arguments = cxx-tree
}
diff --git a/xsd-tests/processing/inheritance/buildfile b/xsd-tests/processing/inheritance/buildfile
index 09e64a4..3dee900 100644
--- a/xsd-tests/processing/inheritance/buildfile
+++ b/xsd-tests/processing/inheritance/buildfile
@@ -24,9 +24,7 @@ for nm: 000 001
<{hxx cxx}{$sc}>: xsd{$sc} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
diff --git a/xsd-tests/processing/inheritance/driver.cxx.in b/xsd-tests/processing/inheritance/driver.cxx.in
index df18427..b37ad02 100644
--- a/xsd-tests/processing/inheritance/driver.cxx.in
+++ b/xsd-tests/processing/inheritance/driver.cxx.in
@@ -3,6 +3,9 @@
#include "test-$num$.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/schema/anonymous/buildfile b/xsd-tests/schema/anonymous/buildfile
index cc01697..060d7d6 100644
--- a/xsd-tests/schema/anonymous/buildfile
+++ b/xsd-tests/schema/anonymous/buildfile
@@ -11,9 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
<{hxx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
diff --git a/xsd-tests/schema/anonymous/driver.cxx b/xsd-tests/schema/anonymous/driver.cxx
index f902fdb..be1e3f0 100644
--- a/xsd-tests/schema/anonymous/driver.cxx
+++ b/xsd-tests/schema/anonymous/driver.cxx
@@ -3,6 +3,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/schema/any-attribute/buildfile b/xsd-tests/schema/any-attribute/buildfile
index e4275a4..b215090 100644
--- a/xsd-tests/schema/any-attribute/buildfile
+++ b/xsd-tests/schema/any-attribute/buildfile
@@ -8,5 +8,5 @@
testscript{*}:
{
test = $xsd
- test.arguments = cxx-tree --std c++11
+ test.arguments = cxx-tree
}
diff --git a/xsd-tests/schema/any-type/buildfile b/xsd-tests/schema/any-type/buildfile
index e575562..9ab1e7d 100644
--- a/xsd-tests/schema/any-type/buildfile
+++ b/xsd-tests/schema/any-type/buildfile
@@ -11,9 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
<{hxx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0]) 2>>?~%EOE%
diff --git a/xsd-tests/schema/any-type/driver.cxx b/xsd-tests/schema/any-type/driver.cxx
index a94f099..9e82604 100644
--- a/xsd-tests/schema/any-type/driver.cxx
+++ b/xsd-tests/schema/any-type/driver.cxx
@@ -3,6 +3,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/schema/any/buildfile b/xsd-tests/schema/any/buildfile
index 6b76348..f6c163a 100644
--- a/xsd-tests/schema/any/buildfile
+++ b/xsd-tests/schema/any/buildfile
@@ -24,9 +24,7 @@ for sc: test fail
<{hxx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
@@ -34,9 +32,7 @@ for sc: test fail
<{hxx cxx}{fail}>: xsd{fail} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0]) 2>>?~%EOE%
diff --git a/xsd-tests/schema/any/driver.cxx.in b/xsd-tests/schema/any/driver.cxx.in
index 9c36761..33d5aa7 100644
--- a/xsd-tests/schema/any/driver.cxx.in
+++ b/xsd-tests/schema/any/driver.cxx.in
@@ -3,6 +3,9 @@
#include "$sch$.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/schema/attribute-group/buildfile b/xsd-tests/schema/attribute-group/buildfile
index b9ca83b..4b7d27e 100644
--- a/xsd-tests/schema/attribute-group/buildfile
+++ b/xsd-tests/schema/attribute-group/buildfile
@@ -11,9 +11,7 @@ exe{driver}: {hxx cxx}{* -global} {hxx cxx}{global} $libs
<{hxx cxx}{global}>: xsd{global} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
diff --git a/xsd-tests/schema/attribute-group/driver.cxx b/xsd-tests/schema/attribute-group/driver.cxx
index 328cef4..2ca9593 100644
--- a/xsd-tests/schema/attribute-group/driver.cxx
+++ b/xsd-tests/schema/attribute-group/driver.cxx
@@ -3,6 +3,9 @@
#include "global.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/schema/attribute/buildfile b/xsd-tests/schema/attribute/buildfile
index 00e5410..30d1464 100644
--- a/xsd-tests/schema/attribute/buildfile
+++ b/xsd-tests/schema/attribute/buildfile
@@ -15,9 +15,7 @@ for f: $fs
{
<{hxx cxx}{$f}>: xsd{$f} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
diff --git a/xsd-tests/schema/attribute/driver.cxx b/xsd-tests/schema/attribute/driver.cxx
index 3d29b36..061e69c 100644
--- a/xsd-tests/schema/attribute/driver.cxx
+++ b/xsd-tests/schema/attribute/driver.cxx
@@ -5,6 +5,9 @@
#include "global.hxx"
#include "local.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/schema/cardinality/buildfile b/xsd-tests/schema/cardinality/buildfile
index cfbb732..93ad75a 100644
--- a/xsd-tests/schema/cardinality/buildfile
+++ b/xsd-tests/schema/cardinality/buildfile
@@ -11,9 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
<{hxx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
diff --git a/xsd-tests/schema/cardinality/driver.cxx b/xsd-tests/schema/cardinality/driver.cxx
index d8b218e..2c7dd73 100644
--- a/xsd-tests/schema/cardinality/driver.cxx
+++ b/xsd-tests/schema/cardinality/driver.cxx
@@ -3,6 +3,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/schema/chameleon/buildfile b/xsd-tests/schema/chameleon/buildfile
index 0143422..e270cf0 100644
--- a/xsd-tests/schema/chameleon/buildfile
+++ b/xsd-tests/schema/chameleon/buildfile
@@ -15,9 +15,7 @@ for f: $fs
{
<{hxx cxx}{$f}>: xsd{$f} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $directory($path($>[0])) \
$path($<[0])
diff --git a/xsd-tests/schema/chameleon/driver.cxx b/xsd-tests/schema/chameleon/driver.cxx
index 7b408ef..553b1d3 100644
--- a/xsd-tests/schema/chameleon/driver.cxx
+++ b/xsd-tests/schema/chameleon/driver.cxx
@@ -4,6 +4,9 @@
#include "includer.hxx"
#include "schemas/includee.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/schema/enumeration/buildfile b/xsd-tests/schema/enumeration/buildfile
index efb6b9e..5188b04 100644
--- a/xsd-tests/schema/enumeration/buildfile
+++ b/xsd-tests/schema/enumeration/buildfile
@@ -11,9 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
<{hxx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
diff --git a/xsd-tests/schema/enumeration/driver.cxx b/xsd-tests/schema/enumeration/driver.cxx
index 406c8ab..df1f680 100644
--- a/xsd-tests/schema/enumeration/driver.cxx
+++ b/xsd-tests/schema/enumeration/driver.cxx
@@ -3,6 +3,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/schema/forward/buildfile b/xsd-tests/schema/forward/buildfile
index 969f99f..3b30f53 100644
--- a/xsd-tests/schema/forward/buildfile
+++ b/xsd-tests/schema/forward/buildfile
@@ -11,9 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
<{hxx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
diff --git a/xsd-tests/schema/forward/driver.cxx b/xsd-tests/schema/forward/driver.cxx
index ee6519e..e8c0de0 100644
--- a/xsd-tests/schema/forward/driver.cxx
+++ b/xsd-tests/schema/forward/driver.cxx
@@ -3,6 +3,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/schema/group/buildfile b/xsd-tests/schema/group/buildfile
index dd926dd..e93b592 100644
--- a/xsd-tests/schema/group/buildfile
+++ b/xsd-tests/schema/group/buildfile
@@ -15,9 +15,7 @@ for f: $fs
{
<{hxx cxx}{$f}>: xsd{$f} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
diff --git a/xsd-tests/schema/group/driver.cxx b/xsd-tests/schema/group/driver.cxx
index e754194..d4744e5 100644
--- a/xsd-tests/schema/group/driver.cxx
+++ b/xsd-tests/schema/group/driver.cxx
@@ -4,6 +4,9 @@
#include "test.hxx"
#include "global.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/schema/import/buildfile b/xsd-tests/schema/import/buildfile
index 9e6aec5..c5fab29 100644
--- a/xsd-tests/schema/import/buildfile
+++ b/xsd-tests/schema/import/buildfile
@@ -15,9 +15,7 @@ for f: $fs
{
<{hxx cxx}{$f}>: xsd{$f} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $directory($path($>[0])) \
$path($<[0])
diff --git a/xsd-tests/schema/import/driver.cxx b/xsd-tests/schema/import/driver.cxx
index a94b2f3..aa289ea 100644
--- a/xsd-tests/schema/import/driver.cxx
+++ b/xsd-tests/schema/import/driver.cxx
@@ -3,6 +3,9 @@
#include "importer.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/schema/include/buildfile b/xsd-tests/schema/include/buildfile
index 904e819..c013903 100644
--- a/xsd-tests/schema/include/buildfile
+++ b/xsd-tests/schema/include/buildfile
@@ -15,9 +15,7 @@ for f: $fs
{
<{hxx cxx}{$f}>: xsd{$f} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $directory($path($>[0])) \
$path($<[0])
diff --git a/xsd-tests/schema/include/driver.cxx b/xsd-tests/schema/include/driver.cxx
index 779d9d6..8276621 100644
--- a/xsd-tests/schema/include/driver.cxx
+++ b/xsd-tests/schema/include/driver.cxx
@@ -3,6 +3,9 @@
#include "includer.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/schema/inheritance/buildfile b/xsd-tests/schema/inheritance/buildfile
index 48c6dde..0eae9b3 100644
--- a/xsd-tests/schema/inheritance/buildfile
+++ b/xsd-tests/schema/inheritance/buildfile
@@ -11,9 +11,7 @@ for f: $fs
{
<{hxx cxx}{$f}>: xsd{$f} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--output-dir $directory($path($>[0])) \
$path($<[0])
}}
@@ -26,5 +24,5 @@ for f: $fs
testscript{*}:
{
test = $xsd
- test.arguments = cxx-tree --std c++11
+ test.arguments = cxx-tree
}
diff --git a/xsd-tests/schema/list/buildfile b/xsd-tests/schema/list/buildfile
index 5d8f7fc..090e69a 100644
--- a/xsd-tests/schema/list/buildfile
+++ b/xsd-tests/schema/list/buildfile
@@ -11,9 +11,7 @@ for f: $fs
{
<{hxx cxx}{$f}>: xsd{$f} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $directory($path($>[0])) \
$path($<[0])
@@ -27,5 +25,5 @@ for f: $fs
testscript{*}:
{
test = $xsd
- test.arguments = cxx-tree --std c++11
+ test.arguments = cxx-tree
}
diff --git a/xsd-tests/schema/no-namespace/buildfile b/xsd-tests/schema/no-namespace/buildfile
index e407218..6723d4f 100644
--- a/xsd-tests/schema/no-namespace/buildfile
+++ b/xsd-tests/schema/no-namespace/buildfile
@@ -11,9 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
<{hxx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
diff --git a/xsd-tests/schema/no-namespace/driver.cxx b/xsd-tests/schema/no-namespace/driver.cxx
index ef62942..6d31468 100644
--- a/xsd-tests/schema/no-namespace/driver.cxx
+++ b/xsd-tests/schema/no-namespace/driver.cxx
@@ -3,6 +3,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/schema/recursive/buildfile b/xsd-tests/schema/recursive/buildfile
index 34542c6..a166e82 100644
--- a/xsd-tests/schema/recursive/buildfile
+++ b/xsd-tests/schema/recursive/buildfile
@@ -11,9 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
<{hxx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
diff --git a/xsd-tests/schema/recursive/driver.cxx b/xsd-tests/schema/recursive/driver.cxx
index 55c33cd..0e85546 100644
--- a/xsd-tests/schema/recursive/driver.cxx
+++ b/xsd-tests/schema/recursive/driver.cxx
@@ -3,6 +3,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/schema/ref-type/invalid/buildfile b/xsd-tests/schema/ref-type/invalid/buildfile
index 42c7bfb..aac448c 100644
--- a/xsd-tests/schema/ref-type/invalid/buildfile
+++ b/xsd-tests/schema/ref-type/invalid/buildfile
@@ -8,5 +8,5 @@
testscript{*}:
{
test = $xsd
- test.arguments = cxx-tree --std c++11
+ test.arguments = cxx-tree
}
diff --git a/xsd-tests/schema/ref-type/valid/buildfile b/xsd-tests/schema/ref-type/valid/buildfile
index 0534fce..ff962dc 100644
--- a/xsd-tests/schema/ref-type/valid/buildfile
+++ b/xsd-tests/schema/ref-type/valid/buildfile
@@ -23,9 +23,7 @@ for sc: idref idrefs
<{hxx cxx}{$sc}>: xsd{$sc} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
diff --git a/xsd-tests/schema/ref-type/valid/driver.cxx.in b/xsd-tests/schema/ref-type/valid/driver.cxx.in
index 434aa40..0c2936b 100644
--- a/xsd-tests/schema/ref-type/valid/driver.cxx.in
+++ b/xsd-tests/schema/ref-type/valid/driver.cxx.in
@@ -3,6 +3,9 @@
#include "$sch$.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/schema/restriction/buildfile b/xsd-tests/schema/restriction/buildfile
index c05718a..314b095 100644
--- a/xsd-tests/schema/restriction/buildfile
+++ b/xsd-tests/schema/restriction/buildfile
@@ -11,9 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
<{hxx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
diff --git a/xsd-tests/schema/restriction/driver.cxx b/xsd-tests/schema/restriction/driver.cxx
index 2ffeb74..eeacc91 100644
--- a/xsd-tests/schema/restriction/driver.cxx
+++ b/xsd-tests/schema/restriction/driver.cxx
@@ -3,6 +3,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{
diff --git a/xsd-tests/schema/union/buildfile b/xsd-tests/schema/union/buildfile
index 00d0a83..8ff9349 100644
--- a/xsd-tests/schema/union/buildfile
+++ b/xsd-tests/schema/union/buildfile
@@ -11,9 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
<{hxx cxx}{test}>: xsd{test} $xsd
{{
- diag xsd ($<[0]) # @@ TMP
-
- $xsd cxx-tree --std c++11 \
+ $xsd cxx-tree \
--root-element-all \
--output-dir $out_base \
$path($<[0])
diff --git a/xsd-tests/schema/union/driver.cxx b/xsd-tests/schema/union/driver.cxx
index 45f290f..2a0f699 100644
--- a/xsd-tests/schema/union/driver.cxx
+++ b/xsd-tests/schema/union/driver.cxx
@@ -3,6 +3,9 @@
#include "test.hxx"
+#undef NDEBUG
+#include <cassert>
+
int
main (int, char*[])
{