Fix diag builtin calls in ad hoc recipes

83 files changed, 27 insertions, 190 deletions

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/clash/buildfile b/xsd-tests/clash/buildfile
index e99dccf..6b8f48b 100644
--- a/xsd-tests/clash/buildfile
+++ b/xsd-tests/clash/buildfile
@@ -15,8 +15,6 @@ for f: $fs
 {
   <{hxx cxx}{$f}>: xsd{$f} $xsd
   {{
-    diag xsd ($<[0]) # @@ TMP
-
     $xsd cxx-tree --std c++11   \
          --root-element-all     \
          --output-dir $out_base \
diff --git a/xsd-tests/code/name-conflict/buildfile b/xsd-tests/code/name-conflict/buildfile
index 3a724f9..cc90ab4 100644
--- a/xsd-tests/code/name-conflict/buildfile
+++ b/xsd-tests/code/name-conflict/buildfile
@@ -11,8 +11,6 @@ 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   \
        --root-element-all     \
        --output-dir $out_base \
diff --git a/xsd-tests/code/name-escaping/buildfile b/xsd-tests/code/name-escaping/buildfile
index c252afd..c2d6467 100644
--- a/xsd-tests/code/name-escaping/buildfile
+++ b/xsd-tests/code/name-escaping/buildfile
@@ -11,8 +11,6 @@ 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   \
        --root-element-all     \
        --output-dir $out_base \
diff --git a/xsd-tests/cxx/parser/built-in/buildfile b/xsd-tests/cxx/parser/built-in/buildfile
index 0522c9a..3da3a59 100644
--- a/xsd-tests/cxx/parser/built-in/buildfile
+++ b/xsd-tests/cxx/parser/built-in/buildfile
@@ -11,8 +11,6 @@ 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    \
        --generate-inline         \
        --skel-file-suffix -pskel \
diff --git a/xsd-tests/cxx/parser/enumeration/buildfile b/xsd-tests/cxx/parser/enumeration/buildfile
index 05163df..d050054 100644
--- a/xsd-tests/cxx/parser/enumeration/buildfile
+++ b/xsd-tests/cxx/parser/enumeration/buildfile
@@ -11,8 +11,6 @@ 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    \
        --generate-inline         \
        --skel-file-suffix -pskel \
diff --git a/xsd-tests/cxx/parser/generated-impl/buildfile b/xsd-tests/cxx/parser/generated-impl/buildfile
index 8710a77..bcb5d12 100644
--- a/xsd-tests/cxx/parser/generated-impl/buildfile
+++ b/xsd-tests/cxx/parser/generated-impl/buildfile
@@ -16,8 +16,6 @@ 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    \
        --generate-inline         \
        --skel-file-suffix -pskel \
diff --git a/xsd-tests/cxx/parser/list/buildfile b/xsd-tests/cxx/parser/list/buildfile
index 426101e..d85aa75 100644
--- a/xsd-tests/cxx/parser/list/buildfile
+++ b/xsd-tests/cxx/parser/list/buildfile
@@ -11,8 +11,6 @@ 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    \
        --generate-inline         \
        --skel-file-suffix -pskel \
diff --git a/xsd-tests/cxx/parser/name-clash/inheritance/buildfile b/xsd-tests/cxx/parser/name-clash/inheritance/buildfile
index 4bd7b48..66e8bae 100644
--- a/xsd-tests/cxx/parser/name-clash/inheritance/buildfile
+++ b/xsd-tests/cxx/parser/name-clash/inheritance/buildfile
@@ -11,8 +11,6 @@ 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    \
        --generate-inline         \
        --skel-file-suffix -pskel \
diff --git a/xsd-tests/cxx/parser/polymorphism/recursive/buildfile b/xsd-tests/cxx/parser/polymorphism/recursive/buildfile
index 629645b..ff43afa 100644
--- a/xsd-tests/cxx/parser/polymorphism/recursive/buildfile
+++ b/xsd-tests/cxx/parser/polymorphism/recursive/buildfile
@@ -11,8 +11,6 @@ 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    \
        --generate-inline         \
        --skel-file-suffix -pskel \
diff --git a/xsd-tests/cxx/parser/polymorphism/same-type/buildfile b/xsd-tests/cxx/parser/polymorphism/same-type/buildfile
index d98e917..039b063 100644
--- a/xsd-tests/cxx/parser/polymorphism/same-type/buildfile
+++ b/xsd-tests/cxx/parser/polymorphism/same-type/buildfile
@@ -11,8 +11,6 @@ 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    \
        --generate-inline         \
        --skel-file-suffix -pskel \
diff --git a/xsd-tests/cxx/parser/recursive/buildfile b/xsd-tests/cxx/parser/recursive/buildfile
index 237855c..583206f 100644
--- a/xsd-tests/cxx/parser/recursive/buildfile
+++ b/xsd-tests/cxx/parser/recursive/buildfile
@@ -11,8 +11,6 @@ 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    \
        --generate-inline         \
        --skel-file-suffix -pskel \
diff --git a/xsd-tests/cxx/parser/test-template/buildfile b/xsd-tests/cxx/parser/test-template/buildfile
index 9f7f5d3..761a437 100644
--- a/xsd-tests/cxx/parser/test-template/buildfile
+++ b/xsd-tests/cxx/parser/test-template/buildfile
@@ -11,8 +11,6 @@ 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    \
        --generate-inline         \
        --skel-file-suffix -pskel \
diff --git a/xsd-tests/cxx/parser/union/buildfile b/xsd-tests/cxx/parser/union/buildfile
index 1a8615c..e73ae2e 100644
--- a/xsd-tests/cxx/parser/union/buildfile
+++ b/xsd-tests/cxx/parser/union/buildfile
@@ -11,8 +11,6 @@ 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    \
        --generate-inline         \
        --skel-file-suffix -pskel \
diff --git a/xsd-tests/cxx/parser/validation/all/buildfile b/xsd-tests/cxx/parser/validation/all/buildfile
index 555843e..fc48800 100644
--- a/xsd-tests/cxx/parser/validation/all/buildfile
+++ b/xsd-tests/cxx/parser/validation/all/buildfile
@@ -9,8 +9,6 @@ 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    \
        --generate-inline         \
        --skel-file-suffix -pskel \
diff --git a/xsd-tests/cxx/parser/validation/any/buildfile b/xsd-tests/cxx/parser/validation/any/buildfile
index 57135f4..29ea8e2 100644
--- a/xsd-tests/cxx/parser/validation/any/buildfile
+++ b/xsd-tests/cxx/parser/validation/any/buildfile
@@ -11,8 +11,6 @@ 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    \
        --generate-inline         \
        --skel-file-suffix -pskel \
diff --git a/xsd-tests/cxx/parser/validation/attribute/buildfile b/xsd-tests/cxx/parser/validation/attribute/buildfile
index d486193..9253c19 100644
--- a/xsd-tests/cxx/parser/validation/attribute/buildfile
+++ b/xsd-tests/cxx/parser/validation/attribute/buildfile
@@ -11,8 +11,6 @@ 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    \
        --generate-inline         \
        --skel-file-suffix -pskel \
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..b557864 100644
--- a/xsd-tests/cxx/parser/validation/built-in/any-type/buildfile
+++ b/xsd-tests/cxx/parser/validation/built-in/any-type/buildfile
@@ -11,8 +11,6 @@ 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    \
        --generate-inline         \
        --skel-file-suffix -pskel \
diff --git a/xsd-tests/cxx/parser/validation/choice/buildfile b/xsd-tests/cxx/parser/validation/choice/buildfile
index adf0832..8cff0ba 100644
--- a/xsd-tests/cxx/parser/validation/choice/buildfile
+++ b/xsd-tests/cxx/parser/validation/choice/buildfile
@@ -9,8 +9,6 @@ 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    \
        --generate-inline         \
        --skel-file-suffix -pskel \
diff --git a/xsd-tests/cxx/parser/validation/restriction/buildfile b/xsd-tests/cxx/parser/validation/restriction/buildfile
index 4c415bf..b247303 100644
--- a/xsd-tests/cxx/parser/validation/restriction/buildfile
+++ b/xsd-tests/cxx/parser/validation/restriction/buildfile
@@ -9,8 +9,6 @@ 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    \
        --generate-inline         \
        --skel-file-suffix -pskel \
diff --git a/xsd-tests/cxx/parser/validation/sequence/buildfile b/xsd-tests/cxx/parser/validation/sequence/buildfile
index b205091..a7f00a6 100644
--- a/xsd-tests/cxx/parser/validation/sequence/buildfile
+++ b/xsd-tests/cxx/parser/validation/sequence/buildfile
@@ -9,8 +9,6 @@ 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    \
        --generate-inline         \
        --skel-file-suffix -pskel \
diff --git a/xsd-tests/cxx/tree/any-type/buildfile b/xsd-tests/cxx/tree/any-type/buildfile
index c65c403..74cc9d9 100644
--- a/xsd-tests/cxx/tree/any-type/buildfile
+++ b/xsd-tests/cxx/tree/any-type/buildfile
@@ -11,8 +11,6 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11     \
        --generate-inline        \
        --generate-serialization \
diff --git a/xsd-tests/cxx/tree/binary/cdr/buildfile b/xsd-tests/cxx/tree/binary/cdr/buildfile
index 7a1c5b4..581a632 100644
--- a/xsd-tests/cxx/tree/binary/cdr/buildfile
+++ b/xsd-tests/cxx/tree/binary/cdr/buildfile
@@ -11,8 +11,6 @@ exe{driver}: xml{test}: test.input = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11                 \
        --generate-inline                    \
        --generate-insertion 'ACE_OutputCDR' \
diff --git a/xsd-tests/cxx/tree/binary/polymorphic/buildfile b/xsd-tests/cxx/tree/binary/polymorphic/buildfile
index d34ef27..701f36a 100644
--- a/xsd-tests/cxx/tree/binary/polymorphic/buildfile
+++ b/xsd-tests/cxx/tree/binary/polymorphic/buildfile
@@ -11,8 +11,6 @@ exe{driver}: xml{test}: test.input = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11                 \
        --generate-inline                    \
        --generate-polymorphic               \
diff --git a/xsd-tests/cxx/tree/binary/xdr-ordered/buildfile b/xsd-tests/cxx/tree/binary/xdr-ordered/buildfile
index 09414c7..4900478 100644
--- a/xsd-tests/cxx/tree/binary/xdr-ordered/buildfile
+++ b/xsd-tests/cxx/tree/binary/xdr-ordered/buildfile
@@ -13,8 +13,6 @@ exe{driver}: xml{test}: test.input = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11        \
        --generate-inline           \
        --generate-insertion 'XDR'  \
diff --git a/xsd-tests/cxx/tree/binary/xdr/buildfile b/xsd-tests/cxx/tree/binary/xdr/buildfile
index b8fc2f4..aefb3cf 100644
--- a/xsd-tests/cxx/tree/binary/xdr/buildfile
+++ b/xsd-tests/cxx/tree/binary/xdr/buildfile
@@ -13,8 +13,6 @@ exe{driver}: xml{test}: test.input = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11        \
        --generate-inline           \
        --generate-insertion 'XDR'  \
diff --git a/xsd-tests/cxx/tree/built-in/buildfile b/xsd-tests/cxx/tree/built-in/buildfile
index 8ee8585..d84e542 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 --std c++11      \
        --generate-inline         \
        --generate-ostream        \
        --generate-serialization  \
diff --git a/xsd-tests/cxx/tree/chameleon/buildfile b/xsd-tests/cxx/tree/chameleon/buildfile
index cec3b01..a30c93e 100644
--- a/xsd-tests/cxx/tree/chameleon/buildfile
+++ b/xsd-tests/cxx/tree/chameleon/buildfile
@@ -11,8 +11,6 @@ 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     \
        --generate-inline      \
        --generate-ostream     \
diff --git a/xsd-tests/cxx/tree/comparison/buildfile b/xsd-tests/cxx/tree/comparison/buildfile
index 507a703..d106e30 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 --std c++11   \
        --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..79a72df 100644
--- a/xsd-tests/cxx/tree/compilation/buildfile
+++ b/xsd-tests/cxx/tree/compilation/buildfile
@@ -8,8 +8,6 @@ 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     \
        --generate-inline        \
        --generate-serialization \
diff --git a/xsd-tests/cxx/tree/complex/ctor/buildfile b/xsd-tests/cxx/tree/complex/ctor/buildfile
index 53e32b7..fccdac0 100644
--- a/xsd-tests/cxx/tree/complex/ctor/buildfile
+++ b/xsd-tests/cxx/tree/complex/ctor/buildfile
@@ -8,8 +8,6 @@ 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      \
        --generate-inline         \
        --generate-default-ctor   \
diff --git a/xsd-tests/cxx/tree/containment/buildfile b/xsd-tests/cxx/tree/containment/buildfile
index 1d0272b..dbdea4a 100644
--- a/xsd-tests/cxx/tree/containment/buildfile
+++ b/xsd-tests/cxx/tree/containment/buildfile
@@ -8,8 +8,6 @@ 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    \
        --generate-inline       \
        --generate-default-ctor \
diff --git a/xsd-tests/cxx/tree/default/general/buildfile b/xsd-tests/cxx/tree/default/general/buildfile
index 4e482ce..c84665f 100644
--- a/xsd-tests/cxx/tree/default/general/buildfile
+++ b/xsd-tests/cxx/tree/default/general/buildfile
@@ -11,8 +11,6 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11      \
        --generate-inline         \
        --generate-serialization  \
diff --git a/xsd-tests/cxx/tree/default/omit/buildfile b/xsd-tests/cxx/tree/default/omit/buildfile
index 407ab1e..af3ce3c 100644
--- a/xsd-tests/cxx/tree/default/omit/buildfile
+++ b/xsd-tests/cxx/tree/default/omit/buildfile
@@ -11,8 +11,6 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11      \
        --generate-inline         \
        --generate-serialization  \
diff --git a/xsd-tests/cxx/tree/detach/buildfile b/xsd-tests/cxx/tree/detach/buildfile
index 07f5f03..c0b0f73 100644
--- a/xsd-tests/cxx/tree/detach/buildfile
+++ b/xsd-tests/cxx/tree/detach/buildfile
@@ -8,8 +8,6 @@ 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    \
        --generate-inline       \
        --generate-detach       \
diff --git a/xsd-tests/cxx/tree/dom-association/buildfile b/xsd-tests/cxx/tree/dom-association/buildfile
index 85593e5..4a9df12 100644
--- a/xsd-tests/cxx/tree/dom-association/buildfile
+++ b/xsd-tests/cxx/tree/dom-association/buildfile
@@ -11,8 +11,6 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11     \
        --generate-inline        \
        --generate-ostream       \
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..7d38ce6 100644
--- a/xsd-tests/cxx/tree/encoding/char/iso-8859-1/buildfile
+++ b/xsd-tests/cxx/tree/encoding/char/iso-8859-1/buildfile
@@ -11,8 +11,6 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11      \
        --generate-inline         \
        --generate-serialization  \
diff --git a/xsd-tests/cxx/tree/encoding/char/lcp/buildfile b/xsd-tests/cxx/tree/encoding/char/lcp/buildfile
index d935b09..3b0dfdf 100644
--- a/xsd-tests/cxx/tree/encoding/char/lcp/buildfile
+++ b/xsd-tests/cxx/tree/encoding/char/lcp/buildfile
@@ -11,8 +11,6 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11      \
        --generate-inline         \
        --generate-serialization  \
diff --git a/xsd-tests/cxx/tree/encoding/char/utf-8/buildfile b/xsd-tests/cxx/tree/encoding/char/utf-8/buildfile
index 4d48165..60c7f64 100644
--- a/xsd-tests/cxx/tree/encoding/char/utf-8/buildfile
+++ b/xsd-tests/cxx/tree/encoding/char/utf-8/buildfile
@@ -11,8 +11,6 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11      \
        --generate-inline         \
        --generate-serialization  \
diff --git a/xsd-tests/cxx/tree/encoding/wchar/buildfile b/xsd-tests/cxx/tree/encoding/wchar/buildfile
index f640976..b330416 100644
--- a/xsd-tests/cxx/tree/encoding/wchar/buildfile
+++ b/xsd-tests/cxx/tree/encoding/wchar/buildfile
@@ -11,8 +11,6 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11     \
        --generate-inline        \
        --generate-serialization \
diff --git a/xsd-tests/cxx/tree/enumeration/ctor/buildfile b/xsd-tests/cxx/tree/enumeration/ctor/buildfile
index 96be1ce..7d9c030 100644
--- a/xsd-tests/cxx/tree/enumeration/ctor/buildfile
+++ b/xsd-tests/cxx/tree/enumeration/ctor/buildfile
@@ -8,8 +8,6 @@ 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      \
        --generate-inline         \
        --generate-default-ctor   \
diff --git a/xsd-tests/cxx/tree/enumeration/inheritance/buildfile b/xsd-tests/cxx/tree/enumeration/inheritance/buildfile
index 184c95c..62ee2d7 100644
--- a/xsd-tests/cxx/tree/enumeration/inheritance/buildfile
+++ b/xsd-tests/cxx/tree/enumeration/inheritance/buildfile
@@ -11,8 +11,6 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11   \
        --generate-inline      \
        --generate-ostream     \
diff --git a/xsd-tests/cxx/tree/float/buildfile b/xsd-tests/cxx/tree/float/buildfile
index 4872a2f..d9286b5 100644
--- a/xsd-tests/cxx/tree/float/buildfile
+++ b/xsd-tests/cxx/tree/float/buildfile
@@ -11,8 +11,6 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11     \
        --generate-inline        \
        --generate-serialization \
diff --git a/xsd-tests/cxx/tree/list/ctor/buildfile b/xsd-tests/cxx/tree/list/ctor/buildfile
index 2155f95..f5722e2 100644
--- a/xsd-tests/cxx/tree/list/ctor/buildfile
+++ b/xsd-tests/cxx/tree/list/ctor/buildfile
@@ -8,8 +8,6 @@ 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      \
        --generate-inline         \
        --generate-default-ctor   \
diff --git a/xsd-tests/cxx/tree/name-clash/inheritance/buildfile b/xsd-tests/cxx/tree/name-clash/inheritance/buildfile
index 530c42f..7ebafca 100644
--- a/xsd-tests/cxx/tree/name-clash/inheritance/buildfile
+++ b/xsd-tests/cxx/tree/name-clash/inheritance/buildfile
@@ -11,8 +11,6 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11   \
        --generate-inline      \
        --generate-ostream     \
diff --git a/xsd-tests/cxx/tree/naming/camel/buildfile b/xsd-tests/cxx/tree/naming/camel/buildfile
index 8a8410c..4573295 100644
--- a/xsd-tests/cxx/tree/naming/camel/buildfile
+++ b/xsd-tests/cxx/tree/naming/camel/buildfile
@@ -8,8 +8,6 @@ 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     \
        --generate-inline        \
        --generate-serialization \
diff --git a/xsd-tests/cxx/tree/naming/java/buildfile b/xsd-tests/cxx/tree/naming/java/buildfile
index 5d4b447..a309894 100644
--- a/xsd-tests/cxx/tree/naming/java/buildfile
+++ b/xsd-tests/cxx/tree/naming/java/buildfile
@@ -8,8 +8,6 @@ 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     \
        --generate-inline        \
        --generate-serialization \
diff --git a/xsd-tests/cxx/tree/naming/knr/buildfile b/xsd-tests/cxx/tree/naming/knr/buildfile
index c4c2287..9d86481 100644
--- a/xsd-tests/cxx/tree/naming/knr/buildfile
+++ b/xsd-tests/cxx/tree/naming/knr/buildfile
@@ -8,8 +8,6 @@ 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     \
        --generate-inline        \
        --generate-serialization \
diff --git a/xsd-tests/cxx/tree/order/buildfile b/xsd-tests/cxx/tree/order/buildfile
index 91c3cb7..7ae4cec 100644
--- a/xsd-tests/cxx/tree/order/buildfile
+++ b/xsd-tests/cxx/tree/order/buildfile
@@ -11,8 +11,6 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11      \
        --generate-inline         \
        --generate-serialization  \
diff --git a/xsd-tests/cxx/tree/polymorphism/comparison/buildfile b/xsd-tests/cxx/tree/polymorphism/comparison/buildfile
index 0bb0b77..a26182d 100644
--- a/xsd-tests/cxx/tree/polymorphism/comparison/buildfile
+++ b/xsd-tests/cxx/tree/polymorphism/comparison/buildfile
@@ -10,8 +10,6 @@ exe{driver}: xml{test}: test.input = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11     \
        --generate-inline        \
        --generate-serialization \
diff --git a/xsd-tests/cxx/tree/polymorphism/ostream/buildfile b/xsd-tests/cxx/tree/polymorphism/ostream/buildfile
index 2237c73..cd1e510 100644
--- a/xsd-tests/cxx/tree/polymorphism/ostream/buildfile
+++ b/xsd-tests/cxx/tree/polymorphism/ostream/buildfile
@@ -11,8 +11,6 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11   \
        --generate-inline      \
        --generate-polymorphic \
diff --git a/xsd-tests/cxx/tree/polymorphism/same-type/buildfile b/xsd-tests/cxx/tree/polymorphism/same-type/buildfile
index 46720d6..fba6da8 100644
--- a/xsd-tests/cxx/tree/polymorphism/same-type/buildfile
+++ b/xsd-tests/cxx/tree/polymorphism/same-type/buildfile
@@ -11,8 +11,6 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11   \
        --generate-inline      \
        --generate-polymorphic \
diff --git a/xsd-tests/cxx/tree/prefix/buildfile b/xsd-tests/cxx/tree/prefix/buildfile
index 7ac81de..48fcd72 100644
--- a/xsd-tests/cxx/tree/prefix/buildfile
+++ b/xsd-tests/cxx/tree/prefix/buildfile
@@ -15,8 +15,6 @@ for f: $fs
 {
   <{hxx ixx cxx}{$f}>: xsd{$f} $xsd
   {{
-    diag xsd ($<[0]) # @@ TMP
-
     $xsd cxx-tree --std c++11          \
          --generate-inline             \
          --generate-serialization      \
diff --git a/xsd-tests/cxx/tree/test-template/buildfile b/xsd-tests/cxx/tree/test-template/buildfile
index b50e6c3..535893f 100644
--- a/xsd-tests/cxx/tree/test-template/buildfile
+++ b/xsd-tests/cxx/tree/test-template/buildfile
@@ -11,8 +11,6 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11   \
        --generate-inline      \
        --generate-ostream     \
diff --git a/xsd-tests/cxx/tree/types-only/buildfile b/xsd-tests/cxx/tree/types-only/buildfile
index fa02277..1a8a8d9 100644
--- a/xsd-tests/cxx/tree/types-only/buildfile
+++ b/xsd-tests/cxx/tree/types-only/buildfile
@@ -8,8 +8,6 @@ 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   \
        --generate-inline      \
        --suppress-parsing     \
diff --git a/xsd-tests/cxx/tree/union/ctor/buildfile b/xsd-tests/cxx/tree/union/ctor/buildfile
index 6715cb6..02a1241 100644
--- a/xsd-tests/cxx/tree/union/ctor/buildfile
+++ b/xsd-tests/cxx/tree/union/ctor/buildfile
@@ -8,8 +8,6 @@ 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      \
        --generate-inline         \
        --generate-default-ctor   \
diff --git a/xsd-tests/cxx/tree/wildcard/buildfile b/xsd-tests/cxx/tree/wildcard/buildfile
index 67edcdc..6430387 100644
--- a/xsd-tests/cxx/tree/wildcard/buildfile
+++ b/xsd-tests/cxx/tree/wildcard/buildfile
@@ -11,8 +11,6 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11      \
        --generate-inline         \
        --generate-serialization  \
diff --git a/xsd-tests/failed/buildfile b/xsd-tests/failed/buildfile
index 8739001..8c8db9f 100644
--- a/xsd-tests/failed/buildfile
+++ b/xsd-tests/failed/buildfile
@@ -15,8 +15,6 @@ for f: $fs
 {
   <{hxx cxx}{$f}>: xsd{$f} $xsd
   {{
-    diag xsd ($<[0]) # @@ TMP
-
     $xsd cxx-tree --std c++11   \
          --root-element-all     \
          --output-dir $out_base \
diff --git a/xsd-tests/morphing/anonymous/attribute-group/buildfile b/xsd-tests/morphing/anonymous/attribute-group/buildfile
index 3df24fc..fb8e21c 100644
--- a/xsd-tests/morphing/anonymous/attribute-group/buildfile
+++ b/xsd-tests/morphing/anonymous/attribute-group/buildfile
@@ -11,8 +11,6 @@ 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   \
        --root-element-all     \
        --output-dir $out_base \
diff --git a/xsd-tests/morphing/anonymous/basic/buildfile b/xsd-tests/morphing/anonymous/basic/buildfile
index e2573e7..21afec5 100644
--- a/xsd-tests/morphing/anonymous/basic/buildfile
+++ b/xsd-tests/morphing/anonymous/basic/buildfile
@@ -11,8 +11,6 @@ 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   \
        --root-element-all     \
        --output-dir $out_base \
diff --git a/xsd-tests/morphing/anonymous/cyclic-inclusion/buildfile b/xsd-tests/morphing/anonymous/cyclic-inclusion/buildfile
index d25143a..627faa8 100644
--- a/xsd-tests/morphing/anonymous/cyclic-inclusion/buildfile
+++ b/xsd-tests/morphing/anonymous/cyclic-inclusion/buildfile
@@ -15,8 +15,6 @@ for f: $fs
 {
   <{hxx cxx}{$f}>: xsd{$f} $xsd
   {{
-    diag xsd ($<[0]) # @@ TMP
-
     $xsd cxx-tree --std c++11   \
          --root-element-all     \
          --output-dir $out_base \
diff --git a/xsd-tests/morphing/anonymous/group/buildfile b/xsd-tests/morphing/anonymous/group/buildfile
index 9cedf39..5202deb 100644
--- a/xsd-tests/morphing/anonymous/group/buildfile
+++ b/xsd-tests/morphing/anonymous/group/buildfile
@@ -11,8 +11,6 @@ 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   \
        --root-element-all     \
        --output-dir $out_base \
diff --git a/xsd-tests/morphing/anonymous/unstable/buildfile b/xsd-tests/morphing/anonymous/unstable/buildfile
index e83cee7..a615205 100644
--- a/xsd-tests/morphing/anonymous/unstable/buildfile
+++ b/xsd-tests/morphing/anonymous/unstable/buildfile
@@ -11,8 +11,6 @@ for f: $fs
 {
   <{hxx cxx}{$f}>: xsd{$f} $xsd
   {{
-    diag xsd ($<[0]) # @@ TMP
-
     $xsd cxx-tree --std c++11   \
          --root-element-all     \
          --output-dir $out_base \
diff --git a/xsd-tests/processing/inheritance/buildfile b/xsd-tests/processing/inheritance/buildfile
index 09e64a4..d478f4f 100644
--- a/xsd-tests/processing/inheritance/buildfile
+++ b/xsd-tests/processing/inheritance/buildfile
@@ -24,8 +24,6 @@ for nm: 000 001
 
   <{hxx cxx}{$sc}>: xsd{$sc} $xsd
   {{
-    diag xsd ($<[0]) # @@ TMP
-
     $xsd cxx-tree --std c++11   \
          --root-element-all     \
          --output-dir $out_base \
diff --git a/xsd-tests/schema/anonymous/buildfile b/xsd-tests/schema/anonymous/buildfile
index cc01697..ce236f8 100644
--- a/xsd-tests/schema/anonymous/buildfile
+++ b/xsd-tests/schema/anonymous/buildfile
@@ -11,8 +11,6 @@ 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   \
        --root-element-all     \
        --output-dir $out_base \
diff --git a/xsd-tests/schema/any-type/buildfile b/xsd-tests/schema/any-type/buildfile
index e575562..af74cd9 100644
--- a/xsd-tests/schema/any-type/buildfile
+++ b/xsd-tests/schema/any-type/buildfile
@@ -11,8 +11,6 @@ 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   \
        --root-element-all     \
        --output-dir $out_base \
diff --git a/xsd-tests/schema/any/buildfile b/xsd-tests/schema/any/buildfile
index 6b76348..f5d6380 100644
--- a/xsd-tests/schema/any/buildfile
+++ b/xsd-tests/schema/any/buildfile
@@ -24,8 +24,6 @@ for sc: test fail
 
 <{hxx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11   \
        --root-element-all     \
        --output-dir $out_base \
@@ -34,8 +32,6 @@ for sc: test fail
 
 <{hxx cxx}{fail}>: xsd{fail} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
   $xsd cxx-tree --std c++11   \
        --root-element-all     \
        --output-dir $out_base \
diff --git a/xsd-tests/schema/attribute-group/buildfile b/xsd-tests/schema/attribute-group/buildfile
index b9ca83b..4c97e5b 100644
--- a/xsd-tests/schema/attribute-group/buildfile
+++ b/xsd-tests/schema/attribute-group/buildfile
@@ -11,8 +11,6 @@ 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   \
        --root-element-all     \
        --output-dir $out_base \
diff --git a/xsd-tests/schema/attribute/buildfile b/xsd-tests/schema/attribute/buildfile
index 00e5410..a14bafc 100644
--- a/xsd-tests/schema/attribute/buildfile
+++ b/xsd-tests/schema/attribute/buildfile
@@ -15,8 +15,6 @@ for f: $fs
 {
   <{hxx cxx}{$f}>: xsd{$f} $xsd
   {{
-    diag xsd ($<[0]) # @@ TMP
-
     $xsd cxx-tree --std c++11   \
          --root-element-all     \
          --output-dir $out_base \
diff --git a/xsd-tests/schema/cardinality/buildfile b/xsd-tests/schema/cardinality/buildfile
index cfbb732..9b97cf0 100644
--- a/xsd-tests/schema/cardinality/buildfile
+++ b/xsd-tests/schema/cardinality/buildfile
@@ -11,8 +11,6 @@ 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   \
        --root-element-all     \
        --output-dir $out_base \
diff --git a/xsd-tests/schema/chameleon/buildfile b/xsd-tests/schema/chameleon/buildfile
index 0143422..445c052 100644
--- a/xsd-tests/schema/chameleon/buildfile
+++ b/xsd-tests/schema/chameleon/buildfile
@@ -15,8 +15,6 @@ for f: $fs
 {
   <{hxx cxx}{$f}>: xsd{$f} $xsd
   {{
-    diag xsd ($<[0]) # @@ TMP
-
     $xsd cxx-tree --std c++11                  \
          --root-element-all                    \
          --output-dir $directory($path($>[0])) \
diff --git a/xsd-tests/schema/enumeration/buildfile b/xsd-tests/schema/enumeration/buildfile
index efb6b9e..d8b2d85 100644
--- a/xsd-tests/schema/enumeration/buildfile
+++ b/xsd-tests/schema/enumeration/buildfile
@@ -11,8 +11,6 @@ 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   \
        --root-element-all     \
        --output-dir $out_base \
diff --git a/xsd-tests/schema/forward/buildfile b/xsd-tests/schema/forward/buildfile
index 969f99f..ec6b7d9 100644
--- a/xsd-tests/schema/forward/buildfile
+++ b/xsd-tests/schema/forward/buildfile
@@ -11,8 +11,6 @@ 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   \
        --root-element-all     \
        --output-dir $out_base \
diff --git a/xsd-tests/schema/group/buildfile b/xsd-tests/schema/group/buildfile
index dd926dd..f2bb6e1 100644
--- a/xsd-tests/schema/group/buildfile
+++ b/xsd-tests/schema/group/buildfile
@@ -15,8 +15,6 @@ for f: $fs
 {
   <{hxx cxx}{$f}>: xsd{$f} $xsd
   {{
-    diag xsd ($<[0]) # @@ TMP
-
     $xsd cxx-tree --std c++11   \
          --root-element-all     \
          --output-dir $out_base \
diff --git a/xsd-tests/schema/import/buildfile b/xsd-tests/schema/import/buildfile
index 9e6aec5..4cec837 100644
--- a/xsd-tests/schema/import/buildfile
+++ b/xsd-tests/schema/import/buildfile
@@ -15,8 +15,6 @@ for f: $fs
 {
   <{hxx cxx}{$f}>: xsd{$f} $xsd
   {{
-    diag xsd ($<[0]) # @@ TMP
-
     $xsd cxx-tree --std c++11                  \
          --root-element-all                    \
          --output-dir $directory($path($>[0])) \
diff --git a/xsd-tests/schema/include/buildfile b/xsd-tests/schema/include/buildfile
index 904e819..dcc151a 100644
--- a/xsd-tests/schema/include/buildfile
+++ b/xsd-tests/schema/include/buildfile
@@ -15,8 +15,6 @@ for f: $fs
 {
   <{hxx cxx}{$f}>: xsd{$f} $xsd
   {{
-    diag xsd ($<[0]) # @@ TMP
-
     $xsd cxx-tree --std c++11                  \
          --root-element-all                    \
          --output-dir $directory($path($>[0])) \
diff --git a/xsd-tests/schema/inheritance/buildfile b/xsd-tests/schema/inheritance/buildfile
index 48c6dde..23786d3 100644
--- a/xsd-tests/schema/inheritance/buildfile
+++ b/xsd-tests/schema/inheritance/buildfile
@@ -11,8 +11,6 @@ for f: $fs
 {
   <{hxx cxx}{$f}>: xsd{$f} $xsd
   {{
-    diag xsd ($<[0]) # @@ TMP
-
     $xsd cxx-tree --std c++11                  \
          --output-dir $directory($path($>[0])) \
          $path($<[0])
diff --git a/xsd-tests/schema/list/buildfile b/xsd-tests/schema/list/buildfile
index 5d8f7fc..88ed0ee 100644
--- a/xsd-tests/schema/list/buildfile
+++ b/xsd-tests/schema/list/buildfile
@@ -11,8 +11,6 @@ for f: $fs
 {
   <{hxx cxx}{$f}>: xsd{$f} $xsd
   {{
-    diag xsd ($<[0]) # @@ TMP
-
     $xsd cxx-tree --std c++11                  \
          --root-element-all                    \
          --output-dir $directory($path($>[0])) \
diff --git a/xsd-tests/schema/no-namespace/buildfile b/xsd-tests/schema/no-namespace/buildfile
index e407218..5d50490 100644
--- a/xsd-tests/schema/no-namespace/buildfile
+++ b/xsd-tests/schema/no-namespace/buildfile
@@ -11,8 +11,6 @@ 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   \
        --root-element-all     \
        --output-dir $out_base \
diff --git a/xsd-tests/schema/recursive/buildfile b/xsd-tests/schema/recursive/buildfile
index 34542c6..99788f6 100644
--- a/xsd-tests/schema/recursive/buildfile
+++ b/xsd-tests/schema/recursive/buildfile
@@ -11,8 +11,6 @@ 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   \
        --root-element-all     \
        --output-dir $out_base \
diff --git a/xsd-tests/schema/ref-type/valid/buildfile b/xsd-tests/schema/ref-type/valid/buildfile
index 0534fce..2b27cf1 100644
--- a/xsd-tests/schema/ref-type/valid/buildfile
+++ b/xsd-tests/schema/ref-type/valid/buildfile
@@ -23,8 +23,6 @@ for sc: idref idrefs
 
   <{hxx cxx}{$sc}>: xsd{$sc} $xsd
   {{
-    diag xsd ($<[0]) # @@ TMP
-
     $xsd cxx-tree --std c++11   \
          --root-element-all     \
          --output-dir $out_base \
diff --git a/xsd-tests/schema/restriction/buildfile b/xsd-tests/schema/restriction/buildfile
index c05718a..b245187 100644
--- a/xsd-tests/schema/restriction/buildfile
+++ b/xsd-tests/schema/restriction/buildfile
@@ -11,8 +11,6 @@ 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   \
        --root-element-all     \
        --output-dir $out_base \
diff --git a/xsd-tests/schema/union/buildfile b/xsd-tests/schema/union/buildfile
index 00d0a83..9cdc56f 100644
--- a/xsd-tests/schema/union/buildfile
+++ b/xsd-tests/schema/union/buildfile
@@ -11,8 +11,6 @@ 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   \
        --root-element-all     \
        --output-dir $out_base \