From 8f98a0f7574d0f73d8d0e548416808911a172d49 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 13 Jul 2017 12:55:53 +0300 Subject: Fix tests linkage --- tests/base64/buildfile | 4 ++-- tests/cpfile/buildfile | 4 ++-- tests/curl/buildfile | 4 ++-- tests/dir-iterator/buildfile | 4 ++-- tests/fdstream/buildfile | 4 ++-- tests/link/buildfile | 4 ++-- tests/manifest-parser/buildfile | 4 ++-- tests/manifest-roundtrip/buildfile | 6 +++--- tests/manifest-serializer/buildfile | 4 ++-- tests/mventry/buildfile | 4 ++-- tests/openssl/buildfile | 4 ++-- tests/pager/buildfile | 4 ++-- tests/path-entry/buildfile | 4 ++-- tests/path/buildfile | 4 ++-- tests/prefix-map/buildfile | 4 ++-- tests/process-run/buildfile | 4 ++-- tests/process/buildfile | 4 ++-- tests/sendmail/buildfile | 4 ++-- tests/sha256/buildfile | 4 ++-- tests/small-vector/buildfile | 4 ++-- tests/standard-version/buildfile | 4 ++-- tests/strcase/buildfile | 4 ++-- tests/string-parser/buildfile | 4 ++-- tests/tab-parser/buildfile | 4 ++-- tests/target-triplet/buildfile | 4 ++-- tests/timestamp/buildfile | 4 ++-- tests/wildcard/buildfile | 4 ++-- 27 files changed, 55 insertions(+), 55 deletions(-) diff --git a/tests/base64/buildfile b/tests/base64/buildfile index 31ee330..22dfd9d 100644 --- a/tests/base64/buildfile +++ b/tests/base64/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs diff --git a/tests/cpfile/buildfile b/tests/cpfile/buildfile index 0237673..40bb171 100644 --- a/tests/cpfile/buildfile +++ b/tests/cpfile/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs diff --git a/tests/curl/buildfile b/tests/curl/buildfile index 3351e8d..fb5c9ed 100644 --- a/tests/curl/buildfile +++ b/tests/curl/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} test{testscript} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs test{testscript} diff --git a/tests/dir-iterator/buildfile b/tests/dir-iterator/buildfile index d6511b5..f8939ac 100644 --- a/tests/dir-iterator/buildfile +++ b/tests/dir-iterator/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} test{testscript} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs test{testscript} diff --git a/tests/fdstream/buildfile b/tests/fdstream/buildfile index 3df2edd..1778781 100644 --- a/tests/fdstream/buildfile +++ b/tests/fdstream/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs diff --git a/tests/link/buildfile b/tests/link/buildfile index e0dfda7..844f498 100644 --- a/tests/link/buildfile +++ b/tests/link/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs diff --git a/tests/manifest-parser/buildfile b/tests/manifest-parser/buildfile index b296f76..cdb36f3 100644 --- a/tests/manifest-parser/buildfile +++ b/tests/manifest-parser/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs diff --git a/tests/manifest-roundtrip/buildfile b/tests/manifest-roundtrip/buildfile index 14a38c5..c20c80e 100644 --- a/tests/manifest-roundtrip/buildfile +++ b/tests/manifest-roundtrip/buildfile @@ -2,7 +2,7 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} -exe{driver}: test.roundtrip = manifest +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs +exe{driver}: test.roundtrip = manifest diff --git a/tests/manifest-serializer/buildfile b/tests/manifest-serializer/buildfile index b54363b..d05794f 100644 --- a/tests/manifest-serializer/buildfile +++ b/tests/manifest-serializer/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs diff --git a/tests/mventry/buildfile b/tests/mventry/buildfile index e7e5f87..4c55461 100644 --- a/tests/mventry/buildfile +++ b/tests/mventry/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} test{testscript} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs test{testscript} diff --git a/tests/openssl/buildfile b/tests/openssl/buildfile index cf0eebb..1121111 100644 --- a/tests/openssl/buildfile +++ b/tests/openssl/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} test{testscript} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs test{testscript} diff --git a/tests/pager/buildfile b/tests/pager/buildfile index df232e3..e8e8d19 100644 --- a/tests/pager/buildfile +++ b/tests/pager/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs diff --git a/tests/path-entry/buildfile b/tests/path-entry/buildfile index e6605b6..e7df6d7 100644 --- a/tests/path-entry/buildfile +++ b/tests/path-entry/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} test{testscript} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs test{testscript} diff --git a/tests/path/buildfile b/tests/path/buildfile index 01a0272..45359f2 100644 --- a/tests/path/buildfile +++ b/tests/path/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs diff --git a/tests/prefix-map/buildfile b/tests/prefix-map/buildfile index c015d4a..175ab54 100644 --- a/tests/prefix-map/buildfile +++ b/tests/prefix-map/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs diff --git a/tests/process-run/buildfile b/tests/process-run/buildfile index 42987a6..2cfdc53 100644 --- a/tests/process-run/buildfile +++ b/tests/process-run/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} test{testscript} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs test{testscript} diff --git a/tests/process/buildfile b/tests/process/buildfile index 4157d96..44c54ed 100644 --- a/tests/process/buildfile +++ b/tests/process/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} test{testscript} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs test{testscript} diff --git a/tests/sendmail/buildfile b/tests/sendmail/buildfile index 53ca23a..0efac6e 100644 --- a/tests/sendmail/buildfile +++ b/tests/sendmail/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} test{testscript} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs test{testscript} diff --git a/tests/sha256/buildfile b/tests/sha256/buildfile index 2ea2b20..8c2269a 100644 --- a/tests/sha256/buildfile +++ b/tests/sha256/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs diff --git a/tests/small-vector/buildfile b/tests/small-vector/buildfile index 147dbc8..8eb98c0 100644 --- a/tests/small-vector/buildfile +++ b/tests/small-vector/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs diff --git a/tests/standard-version/buildfile b/tests/standard-version/buildfile index c0ce103..20b2d3e 100644 --- a/tests/standard-version/buildfile +++ b/tests/standard-version/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} test{testscript} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs test{testscript} diff --git a/tests/strcase/buildfile b/tests/strcase/buildfile index 5628c3d..4313082 100644 --- a/tests/strcase/buildfile +++ b/tests/strcase/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs diff --git a/tests/string-parser/buildfile b/tests/string-parser/buildfile index 3c4d2e3..f6e744c 100644 --- a/tests/string-parser/buildfile +++ b/tests/string-parser/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} test{testscript} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs test{testscript} diff --git a/tests/tab-parser/buildfile b/tests/tab-parser/buildfile index c0ce103..20b2d3e 100644 --- a/tests/tab-parser/buildfile +++ b/tests/tab-parser/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} test{testscript} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs test{testscript} diff --git a/tests/target-triplet/buildfile b/tests/target-triplet/buildfile index 9466b09..ae0276c 100644 --- a/tests/target-triplet/buildfile +++ b/tests/target-triplet/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs diff --git a/tests/timestamp/buildfile b/tests/timestamp/buildfile index ea2eb38..af69d7e 100644 --- a/tests/timestamp/buildfile +++ b/tests/timestamp/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs diff --git a/tests/wildcard/buildfile b/tests/wildcard/buildfile index adbdc94..c8a4b57 100644 --- a/tests/wildcard/buildfile +++ b/tests/wildcard/buildfile @@ -2,6 +2,6 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: cxx{*} ../../libbutl/lib{butl} test{testscript} +import libs = libbutl%lib{butl} -include ../../libbutl/ +exe{driver}: cxx{*} $libs test{testscript} -- cgit v1.1