Fix diag builtin calls in ad hoc recipes

36 files changed, 2 insertions, 74 deletions

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  \