summaryrefslogtreecommitdiff
path: root/xsd-tests/schema
diff options
context:
space:
mode:
Diffstat (limited to 'xsd-tests/schema')
-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
38 files changed, 75 insertions, 64 deletions
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*[])
{