diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2017-07-12 14:09:36 +0300 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2017-07-12 14:55:45 +0300 |
commit | ae0205a089b02a38acf5beae9fa75664040fc27a (patch) | |
tree | e128a32083a5fe4f10512e27022b4e1c615b4759 /unit-tests | |
parent | 7a141264e858c98053367910c6300c79de7bdb98 (diff) |
Make use of wildcards in buildfiles
Diffstat (limited to 'unit-tests')
-rw-r--r-- | unit-tests/cc/lexer/buildfile | 4 | ||||
-rw-r--r-- | unit-tests/cc/parser/buildfile | 4 | ||||
-rw-r--r-- | unit-tests/function/buildfile | 2 | ||||
-rw-r--r-- | unit-tests/lexer/buildfile | 3 | ||||
-rw-r--r-- | unit-tests/scheduler/buildfile | 2 | ||||
-rw-r--r-- | unit-tests/test/script/lexer/buildfile | 6 | ||||
-rw-r--r-- | unit-tests/test/script/parser/buildfile | 7 | ||||
-rw-r--r-- | unit-tests/test/script/regex/buildfile | 3 |
8 files changed, 13 insertions, 18 deletions
diff --git a/unit-tests/cc/lexer/buildfile b/unit-tests/cc/lexer/buildfile index 53adc33..b2d8e85 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{driver} ../../../build2/cxx{$src} ../../../build2/liba{b} \ -$libs test{*} +exe{driver}: 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 59ef4fa..7f46ba0 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{driver} ../../../build2/cxx{$src} ../../../build2/liba{b} \ -$libs test{*} +exe{driver}: cxx{*} ../../../build2/cxx{$src} ../../../build2/liba{b} \ + $libs test{*} include ../../../build2/ diff --git a/unit-tests/function/buildfile b/unit-tests/function/buildfile index ad29ac7..94c89b1 100644 --- a/unit-tests/function/buildfile +++ b/unit-tests/function/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{driver} ../../build2/cxx{$src} ../../build2/liba{b} $libs test{call syntax} +exe{driver}: cxx{*} ../../build2/cxx{$src} ../../build2/liba{b} $libs test{*} include ../../build2/ diff --git a/unit-tests/lexer/buildfile b/unit-tests/lexer/buildfile index 0ab50de..e061fd7 100644 --- a/unit-tests/lexer/buildfile +++ b/unit-tests/lexer/buildfile @@ -11,7 +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{driver} ../../build2/cxx{$src} ../../build2/liba{b} $libs \ -test{*} +exe{driver}: cxx{*} ../../build2/cxx{$src} ../../build2/liba{b} $libs test{*} include ../../build2/ diff --git a/unit-tests/scheduler/buildfile b/unit-tests/scheduler/buildfile index b3b97ce..18404af 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{driver} ../../build2/cxx{$src} ../../build2/liba{b} $libs +exe{driver}: 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 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/ |