diff options
Diffstat (limited to 'xsd-tests')
90 files changed, 133 insertions, 292 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/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-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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/manifest b/xsd-tests/manifest index b11bba7..dc0c5b6 100644 --- a/xsd-tests/manifest +++ b/xsd-tests/manifest @@ -1,15 +1,17 @@ : 1 name: xsd-tests -version: 4.2.0-b.3.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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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]) |