Add hxx prerequisite type in test buildfiles

8 files changed, 13 insertions, 11 deletions

diff --git a/unit-tests/cc/lexer/buildfile b/unit-tests/cc/lexer/buildfile
index b2d8e85..17a91d0 100644
--- a/unit-tests/cc/lexer/buildfile
+++ b/unit-tests/cc/lexer/buildfile
@@ -12,7 +12,7 @@ functions-process-path functions-regex functions-string                    \
 functions-target-triplet algorithm search dump filesystem scheduler        \
 config/{utility init operation module} spec
 
-exe{driver}: cxx{*} ../../../build2/cxx{$src} ../../../build2/liba{b} \
+exe{driver}: {hxx cxx}{*} ../../../build2/cxx{$src} ../../../build2/liba{b} \
              $libs test{*}
 
 include ../../../build2/
diff --git a/unit-tests/cc/parser/buildfile b/unit-tests/cc/parser/buildfile
index 7f46ba0..d919e2f 100644
--- a/unit-tests/cc/parser/buildfile
+++ b/unit-tests/cc/parser/buildfile
@@ -12,7 +12,7 @@ functions-path functions-process-path functions-regex functions-string   \
 functions-target-triplet algorithm search dump filesystem scheduler      \
 config/{utility init operation module} spec
 
-exe{driver}: cxx{*} ../../../build2/cxx{$src} ../../../build2/liba{b} \
+exe{driver}: {hxx cxx}{*} ../../../build2/cxx{$src} ../../../build2/liba{b} \
              $libs test{*}
 
 include ../../../build2/
diff --git a/unit-tests/function/buildfile b/unit-tests/function/buildfile
index 94c89b1..bae96f5 100644
--- a/unit-tests/function/buildfile
+++ b/unit-tests/function/buildfile
@@ -11,6 +11,7 @@ functions-builtin functions-filesystem functions-path functions-process-path \
 functions-regex functions-string functions-target-triplet algorithm search   \
 dump filesystem scheduler config/{utility init operation module} spec
 
-exe{driver}: cxx{*} ../../build2/cxx{$src} ../../build2/liba{b} $libs test{*}
+exe{driver}: {hxx cxx}{*} ../../build2/cxx{$src} ../../build2/liba{b} $libs \
+             test{*}
 
 include ../../build2/
diff --git a/unit-tests/lexer/buildfile b/unit-tests/lexer/buildfile
index e061fd7..09dbbf1 100644
--- a/unit-tests/lexer/buildfile
+++ b/unit-tests/lexer/buildfile
@@ -11,6 +11,7 @@ functions-builtin functions-filesystem functions-path functions-process-path \
 functions-regex functions-string functions-target-triplet algorithm search   \
 dump filesystem scheduler config/{utility init operation module} spec
 
-exe{driver}: cxx{*} ../../build2/cxx{$src} ../../build2/liba{b} $libs test{*}
+exe{driver}: {hxx cxx}{*} ../../build2/cxx{$src} ../../build2/liba{b} $libs \
+             test{*}
 
 include ../../build2/
diff --git a/unit-tests/scheduler/buildfile b/unit-tests/scheduler/buildfile
index 18404af..842c582 100644
--- a/unit-tests/scheduler/buildfile
+++ b/unit-tests/scheduler/buildfile
@@ -11,6 +11,6 @@ functions-builtin functions-filesystem functions-path functions-process-path \
 functions-regex functions-string functions-target-triplet algorithm search   \
 dump filesystem scheduler config/{utility init operation module} spec
 
-exe{driver}: cxx{*} ../../build2/cxx{$src} ../../build2/liba{b} $libs
+exe{driver}: {hxx cxx}{*} ../../build2/cxx{$src} ../../build2/liba{b} $libs
 
 include ../../build2/
diff --git a/unit-tests/test/script/lexer/buildfile b/unit-tests/test/script/lexer/buildfile
index efc5a9c..365b092 100644
--- a/unit-tests/test/script/lexer/buildfile
+++ b/unit-tests/test/script/lexer/buildfile
@@ -12,7 +12,7 @@ functions-regex functions-string functions-target-triplet algorithm search   \
 dump filesystem scheduler config/{utility init operation module}             \
 test/script/{token lexer} spec
 
-exe{driver}: cxx{*} ../../../../build2/cxx{$src} ../../../../build2/liba{b} \
-             $libs test{*}
+exe{driver}: {hxx cxx}{*} ../../../../build2/cxx{$src} \
+             ../../../../build2/liba{b} $libs test{*}
 
 include ../../../../build2/
diff --git a/unit-tests/test/script/parser/buildfile b/unit-tests/test/script/parser/buildfile
index e0d74df..3f62835 100644
--- a/unit-tests/test/script/parser/buildfile
+++ b/unit-tests/test/script/parser/buildfile
@@ -13,7 +13,7 @@ functions-target-triplet config/{utility init operation module} dump      \
 types-parsers test/{target script/{token lexer parser regex script}}      \
 scheduler spec
 
-exe{driver}: cxx{*} ../../../../build2/cxx{$src} ../../../../build2/liba{b} \
-             $libs test{*}
+exe{driver}: {hxx cxx}{*} ../../../../build2/cxx{$src} \
+             ../../../../build2/liba{b} $libs test{*}
 
 include ../../../../build2/
diff --git a/unit-tests/test/script/regex/buildfile b/unit-tests/test/script/regex/buildfile
index df0bf28..1230338 100644
--- a/unit-tests/test/script/regex/buildfile
+++ b/unit-tests/test/script/regex/buildfile
@@ -7,7 +7,7 @@
 import libs = libbutl%lib{butl}
 src = test/script/regex
 
-exe{driver}: cxx{*} ../../../../build2/cxx{$src} ../../../../build2/liba{b} \
-             $libs
+exe{driver}: {hxx cxx}{*} ../../../../build2/cxx{$src} \
+             ../../../../build2/liba{b} $libs
 
 include ../../../../build2/