From ed8d91c67df5da8a3d121a38c272ad9b9d71abb0 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 12 Jul 2017 21:05:11 +0300 Subject: Make use of wildcards in buildfiles --- tests/buildfile | 5 +---- tests/manifest/buildfile | 2 +- tests/package-version/buildfile | 2 +- tests/repository-location/buildfile | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/buildfile b/tests/buildfile index 47f5226..9eea969 100644 --- a/tests/buildfile +++ b/tests/buildfile @@ -2,7 +2,4 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -d = manifest/ package-version/ repository-location/ - -./: $d -include $d +./: {*/ -build/} diff --git a/tests/manifest/buildfile b/tests/manifest/buildfile index ddc5938..964f4e4 100644 --- a/tests/manifest/buildfile +++ b/tests/manifest/buildfile @@ -4,6 +4,6 @@ import libs += libbutl%lib{butl} -exe{driver}: cxx{driver} ../../libbpkg/lib{bpkg} $libs test{testscript} +exe{driver}: cxx{*} ../../libbpkg/lib{bpkg} $libs test{testscript} include ../../libbpkg/ diff --git a/tests/package-version/buildfile b/tests/package-version/buildfile index 422e92a..044ded6 100644 --- a/tests/package-version/buildfile +++ b/tests/package-version/buildfile @@ -4,6 +4,6 @@ import libs += libbutl%lib{butl} -exe{driver}: cxx{driver} ../../libbpkg/lib{bpkg} $libs +exe{driver}: cxx{*} ../../libbpkg/lib{bpkg} $libs include ../../libbpkg/ diff --git a/tests/repository-location/buildfile b/tests/repository-location/buildfile index ecd7da2..813aa73 100644 --- a/tests/repository-location/buildfile +++ b/tests/repository-location/buildfile @@ -4,6 +4,6 @@ import libs += libbutl%lib{butl} -exe{driver}: cxx{driver} ../../libbpkg/lib{bpkg} $libs +exe{driver}: cxx{*} ../../libbpkg/lib{bpkg} $libs include ../../libbpkg/ -- cgit v1.1