Use utility library to arrange unit testing

8 files changed, 8 insertions, 96 deletions

diff --git a/unit-tests/cc/lexer/buildfile b/unit-tests/cc/lexer/buildfile
index 17a91d0..8c20552 100644
--- a/unit-tests/cc/lexer/buildfile
+++ b/unit-tests/cc/lexer/buildfile
@@ -2,17 +2,5 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-#@@ Temporary until we get utility library support.
-#
-import libs = libbutl%lib{butl}
-src = cc/lexer token lexer diagnostics utility variable name b-options     \
-types-parsers context scope parser target operation rule prerequisite file \
-module function 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}: {hxx cxx}{*} ../../../build2/cxx{$src} ../../../build2/liba{b} \
-             $libs test{*}
-
 include ../../../build2/
+exe{driver}: {hxx cxx}{*} ../../../build2/libu{b} test{*}
diff --git a/unit-tests/cc/parser/buildfile b/unit-tests/cc/parser/buildfile
index d919e2f..0c04bb1 100644
--- a/unit-tests/cc/parser/buildfile
+++ b/unit-tests/cc/parser/buildfile
@@ -2,17 +2,5 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-#@@ Temporary until we get utility library support.
-#
-import libs = libbutl%lib{butl}
-src = cc/{lexer parser} token lexer diagnostics utility variable name    \
-b-options types-parsers context scope parser target operation rule       \
-prerequisite file module function 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}: {hxx cxx}{*} ../../../build2/cxx{$src} ../../../build2/liba{b} \
-             $libs test{*}
-
 include ../../../build2/
+exe{driver}: {hxx cxx}{*} ../../../build2/libu{b} test{*}
diff --git a/unit-tests/function/buildfile b/unit-tests/function/buildfile
index bae96f5..38f541a 100644
--- a/unit-tests/function/buildfile
+++ b/unit-tests/function/buildfile
@@ -2,16 +2,5 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-#@@ Temporary until we get utility library support.
-#
-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 \
-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}: {hxx cxx}{*} ../../build2/cxx{$src} ../../build2/liba{b} $libs \
-             test{*}
-
 include ../../build2/
+exe{driver}: {hxx cxx}{*} ../../build2/libu{b} test{*}
diff --git a/unit-tests/lexer/buildfile b/unit-tests/lexer/buildfile
index 09dbbf1..6df2a72 100644
--- a/unit-tests/lexer/buildfile
+++ b/unit-tests/lexer/buildfile
@@ -2,16 +2,5 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-#@@ Temporary until we get utility library support.
-#
-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 \
-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}: {hxx cxx}{*} ../../build2/cxx{$src} ../../build2/liba{b} $libs \
-             test{*}
-
 include ../../build2/
+exe{driver}: {hxx cxx}{*} ../../build2/libu{b} test{*}
diff --git a/unit-tests/scheduler/buildfile b/unit-tests/scheduler/buildfile
index 842c582..81c077b 100644
--- a/unit-tests/scheduler/buildfile
+++ b/unit-tests/scheduler/buildfile
@@ -2,15 +2,5 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-#@@ Temporary until we get utility library support.
-#
-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 \
-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}: {hxx cxx}{*} ../../build2/cxx{$src} ../../build2/liba{b} $libs
-
 include ../../build2/
+exe{driver}: {hxx cxx}{*} ../../build2/libu{b}
diff --git a/unit-tests/test/script/lexer/buildfile b/unit-tests/test/script/lexer/buildfile
index 365b092..8cb284c 100644
--- a/unit-tests/test/script/lexer/buildfile
+++ b/unit-tests/test/script/lexer/buildfile
@@ -2,17 +2,5 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-#@@ Temporary until we get utility library support.
-#
-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 \
-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}             \
-test/script/{token lexer} spec
-
-exe{driver}: {hxx cxx}{*} ../../../../build2/cxx{$src} \
-             ../../../../build2/liba{b} $libs test{*}
-
 include ../../../../build2/
+exe{driver}: {hxx cxx}{*} ../../../../build2/libu{b} test{*}
diff --git a/unit-tests/test/script/parser/buildfile b/unit-tests/test/script/parser/buildfile
index 3f62835..ea76bcd 100644
--- a/unit-tests/test/script/parser/buildfile
+++ b/unit-tests/test/script/parser/buildfile
@@ -2,18 +2,5 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-#@@ Temporary until we get utility library support.
-#
-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  \
-filesystem function functions-builtin functions-filesystem functions-path \
-functions-process-path functions-regex functions-string                   \
-functions-target-triplet config/{utility init operation module} dump      \
-types-parsers test/{target script/{token lexer parser regex script}}      \
-scheduler spec
-
-exe{driver}: {hxx cxx}{*} ../../../../build2/cxx{$src} \
-             ../../../../build2/liba{b} $libs test{*}
-
 include ../../../../build2/
+exe{driver}: {hxx cxx}{*} ../../../../build2/libu{b} test{*}
diff --git a/unit-tests/test/script/regex/buildfile b/unit-tests/test/script/regex/buildfile
index 1230338..217ff70 100644
--- a/unit-tests/test/script/regex/buildfile
+++ b/unit-tests/test/script/regex/buildfile
@@ -2,12 +2,5 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-#@@ Temporary until we get utility library support.
-#
-import libs = libbutl%lib{butl}
-src = test/script/regex
-
-exe{driver}: {hxx cxx}{*} ../../../../build2/cxx{$src} \
-             ../../../../build2/liba{b} $libs
-
 include ../../../../build2/
+exe{driver}: {hxx cxx}{*} ../../../../build2/libu{b}