3 files changed, 8 insertions, 8 deletions
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/built-in/testscript b/xsd-tests/cxx/tree/built-in/testscript
index 4dae039..41eae16 100644
--- a/xsd-tests/cxx/tree/built-in/testscript
+++ b/xsd-tests/cxx/tree/built-in/testscript
@@ -4,7 +4,7 @@
 : types
 :
 {
-  cat <<EOI >=elements.xml;
+  cat <<EOI >=elements.xml
     <?xml version="1.0" encoding="UTF-8"?>
     <test:elements
       xmlns:test="http://www.codesynthesis.com/xmlns/test"
@@ -91,7 +91,7 @@
     </test:elements>
     EOI
 
-  cat <<EOI >=attributes.xml;
+  cat <<EOI >=attributes.xml
     <?xml version="1.0" encoding="UTF-8"?>
     <test:attributes
       xmlns:test="http://www.codesynthesis.com/xmlns/test"
@@ -167,7 +167,7 @@
     />
     EOI
 
-  cat <<EOI >=inherited.xml;
+  cat <<EOI >=inherited.xml
     <?xml version="1.0" encoding="UTF-8"?>
     <test:inherited
       xmlns:test="http://www.codesynthesis.com/xmlns/test"
@@ -254,7 +254,7 @@
     </test:inherited>
     EOI
 
-  ln -s $src_base/types.xsd ./;
+  ln -s $src_base/types.xsd ./
 
   $* elements.xml attributes.xml inherited.xml 2>>EOE
     elements: