From 3b5ce7ebbefb78399174ded76314c1d9a26f842f Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 13 Jul 2017 13:07:41 +0300 Subject: Fix tests linkage --- tests/manifest/buildfile | 7 +++---- tests/package-version/buildfile | 7 +++---- tests/repository-location/buildfile | 7 +++---- 3 files changed, 9 insertions(+), 12 deletions(-) (limited to 'tests') diff --git a/tests/manifest/buildfile b/tests/manifest/buildfile index 964f4e4..c61fab4 100644 --- a/tests/manifest/buildfile +++ b/tests/manifest/buildfile @@ -2,8 +2,7 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -import libs += libbutl%lib{butl} +import libs = libbutl%lib{butl} +import libs += libbpkg%lib{bpkg} -exe{driver}: cxx{*} ../../libbpkg/lib{bpkg} $libs test{testscript} - -include ../../libbpkg/ +exe{driver}: cxx{*} $libs test{testscript} diff --git a/tests/package-version/buildfile b/tests/package-version/buildfile index 044ded6..ec5bfaa 100644 --- a/tests/package-version/buildfile +++ b/tests/package-version/buildfile @@ -2,8 +2,7 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -import libs += libbutl%lib{butl} +import libs = libbutl%lib{butl} +import libs += libbpkg%lib{bpkg} -exe{driver}: cxx{*} ../../libbpkg/lib{bpkg} $libs - -include ../../libbpkg/ +exe{driver}: cxx{*} $libs diff --git a/tests/repository-location/buildfile b/tests/repository-location/buildfile index 813aa73..5aafc23 100644 --- a/tests/repository-location/buildfile +++ b/tests/repository-location/buildfile @@ -2,8 +2,7 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -import libs += libbutl%lib{butl} +import libs = libbutl%lib{butl} +import libs += libbpkg%lib{bpkg} -exe{driver}: cxx{*} ../../libbpkg/lib{bpkg} $libs - -include ../../libbpkg/ +exe{driver}: cxx{*} $libs -- cgit v1.1