diff options
Diffstat (limited to 'xsd-tests/cxx/parser/validation/sequence')
-rw-r--r-- | xsd-tests/cxx/parser/validation/sequence/buildfile | 4 | ||||
-rw-r--r-- | xsd-tests/cxx/parser/validation/sequence/driver.cxx | 5 | ||||
-rw-r--r-- | xsd-tests/cxx/parser/validation/sequence/testscript | 14 |
3 files changed, 12 insertions, 11 deletions
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/parser/validation/sequence/testscript b/xsd-tests/cxx/parser/validation/sequence/testscript index deebb9f..b478c4f 100644 --- a/xsd-tests/cxx/parser/validation/sequence/testscript +++ b/xsd-tests/cxx/parser/validation/sequence/testscript @@ -6,7 +6,7 @@ test.arguments += test.xml : valid : { - cat <<EOI >=test.xml; + cat <<EOI >=test.xml <t:root xmlns:t="test" xmlns:o="other" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -118,7 +118,7 @@ test.arguments += test.xml : invalid1 : { - cat <<EOI >=test.xml; + cat <<EOI >=test.xml <t:root xmlns:t="test" xmlns:o="other" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -142,7 +142,7 @@ test.arguments += test.xml : invalid2 : { - cat <<EOI >=test.xml; + cat <<EOI >=test.xml <t:root xmlns:t="test" xmlns:o="other" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -199,7 +199,7 @@ test.arguments += test.xml : invalid3 : { - cat <<EOI >=test.xml; + cat <<EOI >=test.xml <t:root xmlns:t="test" xmlns:o="other" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -231,7 +231,7 @@ test.arguments += test.xml : invalid4 : { - cat <<EOI >=test.xml; + cat <<EOI >=test.xml <t:root xmlns:t="test" xmlns:o="other" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -259,7 +259,7 @@ test.arguments += test.xml : invalid5 : { - cat <<EOI >=test.xml; + cat <<EOI >=test.xml <t:root xmlns:t="test" xmlns:o1="other1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -290,7 +290,7 @@ test.arguments += test.xml : invalid6 : { - cat <<EOI >=test.xml; + cat <<EOI >=test.xml <t:root xmlns:t="test" xmlns:o="other" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |