From ae0205a089b02a38acf5beae9fa75664040fc27a Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 12 Jul 2017 14:09:36 +0300 Subject: Make use of wildcards in buildfiles --- unit-tests/test/script/lexer/buildfile | 6 ++---- unit-tests/test/script/parser/buildfile | 7 ++----- unit-tests/test/script/regex/buildfile | 3 ++- 3 files changed, 6 insertions(+), 10 deletions(-) (limited to 'unit-tests/test') diff --git a/unit-tests/test/script/lexer/buildfile b/unit-tests/test/script/lexer/buildfile index a21df7a..efc5a9c 100644 --- a/unit-tests/test/script/lexer/buildfile +++ b/unit-tests/test/script/lexer/buildfile @@ -12,9 +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{driver} ../../../../build2/cxx{$src} \ -../../../../build2/liba{b} $libs \ -test{command-line first-token second-token command-expansion variable-line \ - description-line variable} +exe{driver}: 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 184fd82..e0d74df 100644 --- a/unit-tests/test/script/parser/buildfile +++ b/unit-tests/test/script/parser/buildfile @@ -13,10 +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{driver} ../../../../build2/cxx{$src} \ -../../../../build2/liba{b} $libs \ -test{cleanup command-if command-re-parse description directive exit \ - expansion here-document here-string include pipe-expr pre-parse \ - redirect regex scope scope-if setup-teardown} +exe{driver}: 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 89f1bc5..df0bf28 100644 --- a/unit-tests/test/script/regex/buildfile +++ b/unit-tests/test/script/regex/buildfile @@ -7,6 +7,7 @@ import libs = libbutl%lib{butl} src = test/script/regex -exe{driver}: cxx{driver} ../../../../build2/cxx{$src} ../../../../build2/liba{b} $libs +exe{driver}: cxx{*} ../../../../build2/cxx{$src} ../../../../build2/liba{b} \ + $libs include ../../../../build2/ -- cgit v1.1