diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2017-03-02 11:23:35 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-03-02 14:03:55 +0200 |
commit | e45345eeee4db91644a58842267393ff2df19fe2 (patch) | |
tree | 2579753e5e63da815cfceeb3c9b559935b7cdd36 /unit-tests | |
parent | 705e806eb94b743ba962080c4b397d9b32af4a50 (diff) |
Fix unit test code generation
Diffstat (limited to 'unit-tests')
-rw-r--r-- | unit-tests/function/buildfile | 4 | ||||
-rw-r--r-- | unit-tests/lexer/buildfile | 4 | ||||
-rw-r--r-- | unit-tests/scheduler/buildfile | 5 | ||||
-rw-r--r-- | unit-tests/test/script/lexer/buildfile | 4 | ||||
-rw-r--r-- | unit-tests/test/script/parser/buildfile | 4 | ||||
-rw-r--r-- | unit-tests/test/script/regex/buildfile | 2 |
6 files changed, 6 insertions, 17 deletions
diff --git a/unit-tests/function/buildfile b/unit-tests/function/buildfile index 4d2862c..0f40dd4 100644 --- a/unit-tests/function/buildfile +++ b/unit-tests/function/buildfile @@ -4,8 +4,6 @@ #@@ Temporary until we get utility library support. # -if ($cxx.target.class != "windows") - cxx.libs += -lpthread import libs = libbutl%lib{butl} src = token lexer diagnostics utility variable name b-options types-parsers \ context scope parser target operation rule prerequisite file module function \ @@ -13,6 +11,6 @@ functions-builtin functions-path functions-process-path functions-string \ functions-target-triplet algorithm search dump filesystem scheduler \ config/{utility init operation} -exe{driver}: cxx{driver} ../../build2/cxx{$src} $libs test{call syntax} +exe{driver}: cxx{driver} ../../build2/cxx{$src} ../../build2/liba{b} $libs test{call syntax} include ../../build2/ diff --git a/unit-tests/lexer/buildfile b/unit-tests/lexer/buildfile index f37c7cf..520d17c 100644 --- a/unit-tests/lexer/buildfile +++ b/unit-tests/lexer/buildfile @@ -4,8 +4,6 @@ #@@ Temporary until we get utility library support. # -if ($cxx.target.class != "windows") - cxx.libs += -lpthread import libs = libbutl%lib{butl} src = token lexer diagnostics utility variable name b-options types-parsers \ context scope parser target operation rule prerequisite file module function \ @@ -13,7 +11,7 @@ functions-builtin functions-path functions-process-path functions-string \ functions-target-triplet algorithm search dump filesystem scheduler \ config/{utility init operation} -exe{driver}: cxx{driver} ../../build2/cxx{$src} $libs \ +exe{driver}: cxx{driver} ../../build2/cxx{$src} ../../build2/liba{b} $libs \ test{comment eval quoting} include ../../build2/ diff --git a/unit-tests/scheduler/buildfile b/unit-tests/scheduler/buildfile index 056930e..5854c31 100644 --- a/unit-tests/scheduler/buildfile +++ b/unit-tests/scheduler/buildfile @@ -4,8 +4,6 @@ #@@ Temporary until we get utility library support. # -if ($cxx.target.class != "windows") - cxx.libs += -lpthread import libs = libbutl%lib{butl} src = token lexer diagnostics utility variable name b-options types-parsers \ context scope parser target operation rule prerequisite file module function \ @@ -13,7 +11,6 @@ functions-builtin functions-path functions-process-path functions-string \ functions-target-triplet algorithm search dump filesystem scheduler \ config/{utility init operation} - -exe{driver}: cxx{driver} ../../build2/cxx{$src} $libs +exe{driver}: cxx{driver} ../../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 aaeadc9..eb42935 100644 --- a/unit-tests/test/script/lexer/buildfile +++ b/unit-tests/test/script/lexer/buildfile @@ -4,8 +4,6 @@ #@@ Temporary until we get utility library support. # -if ($cxx.target.class != "windows") - cxx.libs += -lpthread import libs = libbutl%lib{butl} src = token lexer diagnostics utility variable name b-options types-parsers \ context scope parser target operation rule prerequisite file module function \ @@ -13,7 +11,7 @@ functions-builtin functions-path functions-process-path functions-string \ functions-target-triplet algorithm search dump filesystem scheduler \ config/{utility init operation} test/script/{token lexer} -exe{driver}: cxx{driver} ../../../../build2/cxx{$src} $libs \ +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} diff --git a/unit-tests/test/script/parser/buildfile b/unit-tests/test/script/parser/buildfile index d25d9bf..85668c9 100644 --- a/unit-tests/test/script/parser/buildfile +++ b/unit-tests/test/script/parser/buildfile @@ -4,8 +4,6 @@ #@@ Temporary until we get utility library support. # -if ($cxx.target.class != "windows") - cxx.libs += -lpthread import libs = libbutl%lib{butl} src = token lexer parser diagnostics utility variable name context target \ scope prerequisite file module operation rule b-options algorithm search \ @@ -14,7 +12,7 @@ functions-string functions-target-triplet config/{utility init operation} \ dump types-parsers test/{target script/{token lexer parser regex script}} \ scheduler -exe{driver}: cxx{driver} ../../../../build2/cxx{$src} $libs \ +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} diff --git a/unit-tests/test/script/regex/buildfile b/unit-tests/test/script/regex/buildfile index 2a01c38..89f1bc5 100644 --- a/unit-tests/test/script/regex/buildfile +++ b/unit-tests/test/script/regex/buildfile @@ -7,6 +7,6 @@ import libs = libbutl%lib{butl} src = test/script/regex -exe{driver}: cxx{driver} ../../../../build2/cxx{$src} $libs +exe{driver}: cxx{driver} ../../../../build2/cxx{$src} ../../../../build2/liba{b} $libs include ../../../../build2/ |