From fd9f51181d71cd0219ab5e30289368c44cfb48e9 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 24 Nov 2022 08:30:10 +0200
Subject: Fix diag builtin calls in ad hoc recipes

---
 xsd-tests/cxx/parser/built-in/buildfile                     | 2 --
 xsd-tests/cxx/parser/enumeration/buildfile                  | 2 --
 xsd-tests/cxx/parser/generated-impl/buildfile               | 2 --
 xsd-tests/cxx/parser/list/buildfile                         | 2 --
 xsd-tests/cxx/parser/name-clash/inheritance/buildfile       | 2 --
 xsd-tests/cxx/parser/polymorphism/recursive/buildfile       | 2 --
 xsd-tests/cxx/parser/polymorphism/same-type/buildfile       | 2 --
 xsd-tests/cxx/parser/recursive/buildfile                    | 2 --
 xsd-tests/cxx/parser/test-template/buildfile                | 2 --
 xsd-tests/cxx/parser/union/buildfile                        | 2 --
 xsd-tests/cxx/parser/validation/all/buildfile               | 2 --
 xsd-tests/cxx/parser/validation/any/buildfile               | 2 --
 xsd-tests/cxx/parser/validation/attribute/buildfile         | 2 --
 xsd-tests/cxx/parser/validation/built-in/any-type/buildfile | 2 --
 xsd-tests/cxx/parser/validation/choice/buildfile            | 2 --
 xsd-tests/cxx/parser/validation/restriction/buildfile       | 2 --
 xsd-tests/cxx/parser/validation/sequence/buildfile          | 2 --
 17 files changed, 34 deletions(-)

(limited to 'xsd-tests/cxx/parser')

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 \
-- 
cgit v1.1