From 9ef9eafca42b882c13cc9b333cf49c5501ec385f Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Sat, 15 Jul 2017 15:28:00 +0300
Subject: Make use of wildcards in buildfiles

---
 tests/buildfile             | 4 +---
 tests/ctor/buildfile        | 2 +-
 tests/erase/buildfile       | 2 +-
 tests/file/buildfile        | 2 +-
 tests/inheritance/buildfile | 2 +-
 tests/specifier/buildfile   | 2 +-
 6 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'tests')

diff --git a/tests/buildfile b/tests/buildfile
index 20d2e11..246bb7b 100644
--- a/tests/buildfile
+++ b/tests/buildfile
@@ -2,6 +2,4 @@
 # copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
 # license   : MIT; see accompanying LICENSE file
 
-d = ctor/ erase/ file/ headings/ inheritance/ specifier/ toc/
-./: $d
-include $d
+./: {*/ -build/}
diff --git a/tests/ctor/buildfile b/tests/ctor/buildfile
index 68ea10e..4ba1f1e 100644
--- a/tests/ctor/buildfile
+++ b/tests/ctor/buildfile
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} cli.cxx{test}
+exe{driver}: {hxx cxx}{* -test} cli.cxx{test}
 
 cxx.poptions =+ "-I$out_base"
 
diff --git a/tests/erase/buildfile b/tests/erase/buildfile
index fb58d5a..ec1cff6 100644
--- a/tests/erase/buildfile
+++ b/tests/erase/buildfile
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} cli.cxx{test}
+exe{driver}: {hxx cxx}{* -test} cli.cxx{test}
 exe{driver}: test.arguments = foo -a bar -b 123 --arg -- -b 234
 
 cxx.poptions =+ "-I$out_base"
diff --git a/tests/file/buildfile b/tests/file/buildfile
index 45ba0c6..9e5dfa0 100644
--- a/tests/file/buildfile
+++ b/tests/file/buildfile
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} cli.cxx{test} test{testscript}
+exe{driver}: {hxx cxx}{* -test} cli.cxx{test} test{testscript}
 
 cxx.poptions =+ "-I$out_base"
 
diff --git a/tests/inheritance/buildfile b/tests/inheritance/buildfile
index baade2d..748be5a 100644
--- a/tests/inheritance/buildfile
+++ b/tests/inheritance/buildfile
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} cli.cxx{test}
+exe{driver}: {hxx cxx}{* -test} cli.cxx{test}
 exe{driver}: test.arguments = --very-long-flag -s short -i 123 --string long
 exe{driver}: test.output = test.std
 
diff --git a/tests/specifier/buildfile b/tests/specifier/buildfile
index 364792c..d348550 100644
--- a/tests/specifier/buildfile
+++ b/tests/specifier/buildfile
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} cli.cxx{test}
+exe{driver}: {hxx cxx}{* -test} cli.cxx{test}
 exe{driver}: test.arguments = -a -c foo
 
 cxx.poptions =+ "-I$out_base"
-- 
cgit v1.1