Add hxx prerequisite type in test buildfiles

28 files changed, 29 insertions, 27 deletions

diff --git a/libbutl/buildfile b/libbutl/buildfile
index c4b949d..f2674ff 100644
--- a/libbutl/buildfile
+++ b/libbutl/buildfile
@@ -15,6 +15,8 @@ else
 # (strptime.c timelocal.h timelocal.c), so treat them as files to exclude from
 # the compilation.
 #
+# @@ Change to 'file{*.c *.h}' when supported.
+#
 lib{butl}: file{*.c +*.h}
 
 hxx{version}: in{version} $src_root/file{manifest}
diff --git a/tests/base64/buildfile b/tests/base64/buildfile
index 22dfd9d..710499e 100644
--- a/tests/base64/buildfile
+++ b/tests/base64/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs
+exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/cpfile/buildfile b/tests/cpfile/buildfile
index 40bb171..0d95110 100644
--- a/tests/cpfile/buildfile
+++ b/tests/cpfile/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs
+exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/curl/buildfile b/tests/curl/buildfile
index fb5c9ed..20617cf 100644
--- a/tests/curl/buildfile
+++ b/tests/curl/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs test{testscript}
diff --git a/tests/dir-iterator/buildfile b/tests/dir-iterator/buildfile
index f8939ac..e536536 100644
--- a/tests/dir-iterator/buildfile
+++ b/tests/dir-iterator/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs test{testscript}
diff --git a/tests/fdstream/buildfile b/tests/fdstream/buildfile
index 1778781..5440bc1 100644
--- a/tests/fdstream/buildfile
+++ b/tests/fdstream/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs
+exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/link/buildfile b/tests/link/buildfile
index 844f498..9d4f6b5 100644
--- a/tests/link/buildfile
+++ b/tests/link/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs
+exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/manifest-parser/buildfile b/tests/manifest-parser/buildfile
index cdb36f3..b57cac6 100644
--- a/tests/manifest-parser/buildfile
+++ b/tests/manifest-parser/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs
+exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/manifest-roundtrip/buildfile b/tests/manifest-roundtrip/buildfile
index c20c80e..a2fb3ac 100644
--- a/tests/manifest-roundtrip/buildfile
+++ b/tests/manifest-roundtrip/buildfile
@@ -4,5 +4,5 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs
+exe{driver}: {hxx cxx}{*} $libs
 exe{driver}: test.roundtrip = manifest
diff --git a/tests/manifest-serializer/buildfile b/tests/manifest-serializer/buildfile
index d05794f..d13daab 100644
--- a/tests/manifest-serializer/buildfile
+++ b/tests/manifest-serializer/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs
+exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/mventry/buildfile b/tests/mventry/buildfile
index 4c55461..b665b61 100644
--- a/tests/mventry/buildfile
+++ b/tests/mventry/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs test{testscript}
diff --git a/tests/openssl/buildfile b/tests/openssl/buildfile
index 1121111..7713f14 100644
--- a/tests/openssl/buildfile
+++ b/tests/openssl/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs test{testscript}
diff --git a/tests/pager/buildfile b/tests/pager/buildfile
index e8e8d19..1c1e9f4 100644
--- a/tests/pager/buildfile
+++ b/tests/pager/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs
+exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/path-entry/buildfile b/tests/path-entry/buildfile
index e7df6d7..58e315c 100644
--- a/tests/path-entry/buildfile
+++ b/tests/path-entry/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs test{testscript}
diff --git a/tests/path/buildfile b/tests/path/buildfile
index 45359f2..e7f19f2 100644
--- a/tests/path/buildfile
+++ b/tests/path/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs
+exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/prefix-map/buildfile b/tests/prefix-map/buildfile
index 175ab54..5c2dd69 100644
--- a/tests/prefix-map/buildfile
+++ b/tests/prefix-map/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs
+exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/process-run/buildfile b/tests/process-run/buildfile
index 2cfdc53..770357c 100644
--- a/tests/process-run/buildfile
+++ b/tests/process-run/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs test{testscript}
diff --git a/tests/process/buildfile b/tests/process/buildfile
index 44c54ed..ddb4688 100644
--- a/tests/process/buildfile
+++ b/tests/process/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs test{testscript}
diff --git a/tests/sendmail/buildfile b/tests/sendmail/buildfile
index 0efac6e..a83cf40 100644
--- a/tests/sendmail/buildfile
+++ b/tests/sendmail/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs test{testscript}
diff --git a/tests/sha256/buildfile b/tests/sha256/buildfile
index 8c2269a..627b78f 100644
--- a/tests/sha256/buildfile
+++ b/tests/sha256/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs
+exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/small-vector/buildfile b/tests/small-vector/buildfile
index 8eb98c0..33be9ad 100644
--- a/tests/small-vector/buildfile
+++ b/tests/small-vector/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs
+exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/standard-version/buildfile b/tests/standard-version/buildfile
index 20b2d3e..0583b62 100644
--- a/tests/standard-version/buildfile
+++ b/tests/standard-version/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs test{testscript}
diff --git a/tests/strcase/buildfile b/tests/strcase/buildfile
index 4313082..71fec53 100644
--- a/tests/strcase/buildfile
+++ b/tests/strcase/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs
+exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/string-parser/buildfile b/tests/string-parser/buildfile
index f6e744c..5969cd0 100644
--- a/tests/string-parser/buildfile
+++ b/tests/string-parser/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs test{testscript}
diff --git a/tests/tab-parser/buildfile b/tests/tab-parser/buildfile
index 20b2d3e..0583b62 100644
--- a/tests/tab-parser/buildfile
+++ b/tests/tab-parser/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs test{testscript}
diff --git a/tests/target-triplet/buildfile b/tests/target-triplet/buildfile
index ae0276c..b8ca712 100644
--- a/tests/target-triplet/buildfile
+++ b/tests/target-triplet/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs
+exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/timestamp/buildfile b/tests/timestamp/buildfile
index af69d7e..085daf0 100644
--- a/tests/timestamp/buildfile
+++ b/tests/timestamp/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs
+exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/wildcard/buildfile b/tests/wildcard/buildfile
index c8a4b57..fc8e94b 100644
--- a/tests/wildcard/buildfile
+++ b/tests/wildcard/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libbutl%lib{butl}
 
-exe{driver}: cxx{*} $libs test{testscript}
+exe{driver}: {hxx cxx}{*} $libs test{testscript}