From aab62d018ee070f64ea51b7201cc3c7143284bb7 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 15 Jul 2017 14:22:14 +0300 Subject: Make use of wildcards in buildfiles --- tests/buildfile | 4 +--- tests/compiler/buildfile | 7 ------- tests/compiler/cxx-indenter/buildfile | 2 +- tests/compiler/sloc-counter/buildfile | 2 +- tests/compiler/traversal/buildfile | 2 +- tests/container/buildfile | 7 ------- tests/container/multi-index/buildfile | 2 +- tests/fs/buildfile | 7 ------- tests/fs/path/buildfile | 2 +- tests/re/buildfile | 2 +- tests/shared-ptr/buildfile | 2 +- 11 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 tests/compiler/buildfile delete mode 100644 tests/container/buildfile delete mode 100644 tests/fs/buildfile (limited to 'tests') diff --git a/tests/buildfile b/tests/buildfile index 8b70176..e632a04 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 = compiler/ container/ fs/ re/ shared-ptr/ -./: $d -include $d +./: {*/ -build/ -xml/} diff --git a/tests/compiler/buildfile b/tests/compiler/buildfile deleted file mode 100644 index 8d756ad..0000000 --- a/tests/compiler/buildfile +++ /dev/null @@ -1,7 +0,0 @@ -# file : tests/compiler/buildfile -# copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -d = cxx-indenter/ sloc-counter/ traversal/ -./: $d -include $d diff --git a/tests/compiler/cxx-indenter/buildfile b/tests/compiler/cxx-indenter/buildfile index f764b10..722e050 100644 --- a/tests/compiler/cxx-indenter/buildfile +++ b/tests/compiler/cxx-indenter/buildfile @@ -4,5 +4,5 @@ import libs = libcutl%lib{cutl} -exe{driver}: cxx{driver} $libs +exe{driver}: {hxx cxx}{*} $libs exe{driver}: test.output = output.std diff --git a/tests/compiler/sloc-counter/buildfile b/tests/compiler/sloc-counter/buildfile index c149abf..4cb7c09 100644 --- a/tests/compiler/sloc-counter/buildfile +++ b/tests/compiler/sloc-counter/buildfile @@ -4,4 +4,4 @@ import libs = libcutl%lib{cutl} -exe{driver}: cxx{driver} $libs test{testscript} +exe{driver}: {hxx cxx}{* -test} $libs test{testscript} diff --git a/tests/compiler/traversal/buildfile b/tests/compiler/traversal/buildfile index f859036..791a74b 100644 --- a/tests/compiler/traversal/buildfile +++ b/tests/compiler/traversal/buildfile @@ -4,5 +4,5 @@ import libs = libcutl%lib{cutl} -exe{driver}: cxx{driver} $libs +exe{driver}: {hxx cxx}{*} $libs exe{driver}: test.output = output.std diff --git a/tests/container/buildfile b/tests/container/buildfile deleted file mode 100644 index 3a6d663..0000000 --- a/tests/container/buildfile +++ /dev/null @@ -1,7 +0,0 @@ -# file : tests/container/buildfile -# copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -d = multi-index/ -./: $d -include $d diff --git a/tests/container/multi-index/buildfile b/tests/container/multi-index/buildfile index 36d0bea..a77e23d 100644 --- a/tests/container/multi-index/buildfile +++ b/tests/container/multi-index/buildfile @@ -4,4 +4,4 @@ import libs = libcutl%lib{cutl} -exe{driver}: cxx{driver} $libs +exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/fs/buildfile b/tests/fs/buildfile deleted file mode 100644 index 65d20de..0000000 --- a/tests/fs/buildfile +++ /dev/null @@ -1,7 +0,0 @@ -# file : tests/fs/buildfile -# copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -d = path/ -./: $d -include $d diff --git a/tests/fs/path/buildfile b/tests/fs/path/buildfile index 9809400..3fc481b 100644 --- a/tests/fs/path/buildfile +++ b/tests/fs/path/buildfile @@ -4,4 +4,4 @@ import libs = libcutl%lib{cutl} -exe{driver}: cxx{driver} $libs +exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/re/buildfile b/tests/re/buildfile index ba86f09..8373da0 100644 --- a/tests/re/buildfile +++ b/tests/re/buildfile @@ -4,4 +4,4 @@ import libs = libcutl%lib{cutl} -exe{driver}: cxx{driver} $libs +exe{driver}: {hxx cxx}{*} $libs diff --git a/tests/shared-ptr/buildfile b/tests/shared-ptr/buildfile index fe53cc4..592f317 100644 --- a/tests/shared-ptr/buildfile +++ b/tests/shared-ptr/buildfile @@ -4,4 +4,4 @@ import libs = libcutl%lib{cutl} -exe{driver}: cxx{driver} $libs +exe{driver}: {hxx cxx}{*} $libs -- cgit v1.1