From 61377c582e0f2675baa5f5e6e30a35d1a4164b33 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 1 May 2017 16:08:43 +0300 Subject: Add hxx extension for headers and lib prefix for library dir --- tests/.gitignore | 2 ++ tests/base64/buildfile | 4 ++-- tests/base64/driver.cxx | 2 +- tests/cpfile/buildfile | 4 ++-- tests/cpfile/driver.cxx | 6 +++--- tests/curl/buildfile | 4 ++-- tests/curl/driver.cxx | 6 +++--- tests/dir-iterator/buildfile | 4 ++-- tests/dir-iterator/driver.cxx | 8 ++++---- tests/fdstream/buildfile | 4 ++-- tests/fdstream/driver.cxx | 10 +++++----- tests/link/buildfile | 4 ++-- tests/link/driver.cxx | 6 +++--- tests/manifest-parser/buildfile | 4 ++-- tests/manifest-parser/driver.cxx | 2 +- tests/manifest-roundtrip/buildfile | 4 ++-- tests/manifest-roundtrip/driver.cxx | 8 ++++---- tests/manifest-serializer/buildfile | 4 ++-- tests/manifest-serializer/driver.cxx | 2 +- tests/mventry/buildfile | 4 ++-- tests/mventry/driver.cxx | 6 +++--- tests/pager/buildfile | 4 ++-- tests/pager/driver.cxx | 2 +- tests/path/buildfile | 4 ++-- tests/path/driver.cxx | 4 ++-- tests/prefix-map/buildfile | 4 ++-- tests/prefix-map/driver.cxx | 2 +- tests/process-run/buildfile | 4 ++-- tests/process-run/driver.cxx | 6 +++--- tests/process/buildfile | 4 ++-- tests/process/driver.cxx | 6 +++--- tests/sendmail/buildfile | 4 ++-- tests/sendmail/driver.cxx | 6 +++--- tests/sha256/buildfile | 4 ++-- tests/sha256/driver.cxx | 2 +- tests/small-vector/buildfile | 4 ++-- tests/small-vector/driver.cxx | 2 +- tests/standard-version/buildfile | 4 ++-- tests/standard-version/driver.cxx | 4 ++-- tests/strcase/buildfile | 4 ++-- tests/strcase/driver.cxx | 2 +- tests/string-parser/buildfile | 4 ++-- tests/string-parser/driver.cxx | 4 ++-- tests/tab-parser/buildfile | 4 ++-- tests/tab-parser/driver.cxx | 4 ++-- tests/target-triplet/buildfile | 4 ++-- tests/target-triplet/driver.cxx | 2 +- tests/timestamp/buildfile | 4 ++-- tests/timestamp/driver.cxx | 2 +- tests/wildcard/buildfile | 4 ++-- tests/wildcard/driver.cxx | 6 +++--- 51 files changed, 107 insertions(+), 105 deletions(-) (limited to 'tests') diff --git a/tests/.gitignore b/tests/.gitignore index e54525b..2e508a9 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1 +1,3 @@ driver +test/ +test-*/ diff --git a/tests/base64/buildfile b/tests/base64/buildfile index 223ccff..bfa9c0e 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{driver} ../../butl/lib{butl} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/base64/driver.cxx b/tests/base64/driver.cxx index 64103ed..bbcdc11 100644 --- a/tests/base64/driver.cxx +++ b/tests/base64/driver.cxx @@ -6,7 +6,7 @@ #include #include -#include +#include using namespace std; using namespace butl; diff --git a/tests/cpfile/buildfile b/tests/cpfile/buildfile index 1075026..30c237d 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{driver} ../../butl/lib{butl} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/cpfile/driver.cxx b/tests/cpfile/driver.cxx index 5b8f366..6fa1567 100644 --- a/tests/cpfile/driver.cxx +++ b/tests/cpfile/driver.cxx @@ -7,9 +7,9 @@ #include #include -#include -#include -#include +#include +#include +#include using namespace std; using namespace butl; diff --git a/tests/curl/buildfile b/tests/curl/buildfile index 6b19bea..698ff81 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{driver} ../../butl/lib{butl} test{testscript} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} test{testscript} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/curl/driver.cxx b/tests/curl/driver.cxx index 3711e71..b5fc400 100644 --- a/tests/curl/driver.cxx +++ b/tests/curl/driver.cxx @@ -5,9 +5,9 @@ #include #include -#include -#include // operator<<(ostream, exception) -#include +#include +#include // operator<<(ostream, exception) +#include using namespace std; using namespace butl; diff --git a/tests/dir-iterator/buildfile b/tests/dir-iterator/buildfile index 8952e47..fcc1441 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{driver} ../../butl/lib{butl} test{testscript} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} test{testscript} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/dir-iterator/driver.cxx b/tests/dir-iterator/driver.cxx index d3d25b8..f584c68 100644 --- a/tests/dir-iterator/driver.cxx +++ b/tests/dir-iterator/driver.cxx @@ -6,10 +6,10 @@ #include #include -#include -#include -#include // operator<<(ostream, exception) -#include +#include +#include +#include // operator<<(ostream, exception) +#include using namespace std; using namespace butl; diff --git a/tests/fdstream/buildfile b/tests/fdstream/buildfile index aea7247..de23023 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{driver} ../../butl/lib{butl} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/fdstream/driver.cxx b/tests/fdstream/driver.cxx index f3729cb..c8748b1 100644 --- a/tests/fdstream/driver.cxx +++ b/tests/fdstream/driver.cxx @@ -18,11 +18,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace std; using namespace butl; diff --git a/tests/link/buildfile b/tests/link/buildfile index b5d1bd3..ad04cb0 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{driver} ../../butl/lib{butl} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/link/driver.cxx b/tests/link/driver.cxx index 3cade44..a5e94bb 100644 --- a/tests/link/driver.cxx +++ b/tests/link/driver.cxx @@ -7,9 +7,9 @@ #include // pair #include -#include -#include -#include +#include +#include +#include using namespace std; using namespace butl; diff --git a/tests/manifest-parser/buildfile b/tests/manifest-parser/buildfile index 0997495..0599fc1 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{driver} ../../butl/lib{butl} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/manifest-parser/driver.cxx b/tests/manifest-parser/driver.cxx index 76d1579..7642f4b 100644 --- a/tests/manifest-parser/driver.cxx +++ b/tests/manifest-parser/driver.cxx @@ -9,7 +9,7 @@ #include #include -#include +#include using namespace std; using namespace butl; diff --git a/tests/manifest-roundtrip/buildfile b/tests/manifest-roundtrip/buildfile index 0bf7eb6..71a3eb8 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{driver} ../../butl/lib{butl} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} exe{driver}: test.roundtrip = manifest -include ../../butl/ +include ../../libbutl/ diff --git a/tests/manifest-roundtrip/driver.cxx b/tests/manifest-roundtrip/driver.cxx index 69fcf03..2068409 100644 --- a/tests/manifest-roundtrip/driver.cxx +++ b/tests/manifest-roundtrip/driver.cxx @@ -5,10 +5,10 @@ #include #include -#include // operator<<(ostream, exception) -#include -#include -#include +#include // operator<<(ostream, exception) +#include +#include +#include using namespace std; using namespace butl; diff --git a/tests/manifest-serializer/buildfile b/tests/manifest-serializer/buildfile index 17a4fab..19edcf8 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{driver} ../../butl/lib{butl} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/manifest-serializer/driver.cxx b/tests/manifest-serializer/driver.cxx index 64434c9..147ce48 100644 --- a/tests/manifest-serializer/driver.cxx +++ b/tests/manifest-serializer/driver.cxx @@ -9,7 +9,7 @@ #include #include -#include +#include using namespace std; using namespace butl; diff --git a/tests/mventry/buildfile b/tests/mventry/buildfile index 868a2f6..dfb4e15 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{driver} ../../butl/lib{butl} test{testscript} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} test{testscript} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/mventry/driver.cxx b/tests/mventry/driver.cxx index cf6099c..5639c2b 100644 --- a/tests/mventry/driver.cxx +++ b/tests/mventry/driver.cxx @@ -5,9 +5,9 @@ #include #include -#include -#include // operator<<(ostream, exception) -#include +#include +#include // operator<<(ostream, exception) +#include using namespace std; using namespace butl; diff --git a/tests/pager/buildfile b/tests/pager/buildfile index 5043121..7da0aa0 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{driver} ../../butl/lib{butl} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/pager/driver.cxx b/tests/pager/driver.cxx index 89affd1..87c811d 100644 --- a/tests/pager/driver.cxx +++ b/tests/pager/driver.cxx @@ -10,7 +10,7 @@ #include #include -#include +#include using namespace std; using namespace butl; diff --git a/tests/path/buildfile b/tests/path/buildfile index 3060d6b..4f41a75 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{driver} ../../butl/lib{butl} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/path/driver.cxx b/tests/path/driver.cxx index ec38517..ee62d73 100644 --- a/tests/path/driver.cxx +++ b/tests/path/driver.cxx @@ -6,8 +6,8 @@ #include #include -#include -#include +#include +#include using namespace std; using namespace butl; diff --git a/tests/prefix-map/buildfile b/tests/prefix-map/buildfile index 2750992..644b8eb 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{driver} ../../butl/lib{butl} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/prefix-map/driver.cxx b/tests/prefix-map/driver.cxx index c26bfac..abf7e01 100644 --- a/tests/prefix-map/driver.cxx +++ b/tests/prefix-map/driver.cxx @@ -6,7 +6,7 @@ #include #include -#include +#include using namespace std; using namespace butl; diff --git a/tests/process-run/buildfile b/tests/process-run/buildfile index 5c55af9..ce642f3 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{driver} ../../butl/lib{butl} test{testscript} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} test{testscript} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/process-run/driver.cxx b/tests/process-run/driver.cxx index 15d5f61..ed35d1e 100644 --- a/tests/process-run/driver.cxx +++ b/tests/process-run/driver.cxx @@ -4,9 +4,9 @@ #include -#include -#include -#include +#include +#include +#include using namespace std; using namespace butl; diff --git a/tests/process/buildfile b/tests/process/buildfile index 72cbec2..19f06a8 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{driver} ../../butl/lib{butl} test{testscript} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} test{testscript} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/process/driver.cxx b/tests/process/driver.cxx index ae5015c..bdc5f4a 100644 --- a/tests/process/driver.cxx +++ b/tests/process/driver.cxx @@ -12,9 +12,9 @@ #include // istreambuf_iterator, ostream_iterator #include // copy() -#include -#include -#include +#include +#include +#include using namespace std; using namespace butl; diff --git a/tests/sendmail/buildfile b/tests/sendmail/buildfile index ddc8bca..6ac2558 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{driver} ../../butl/lib{butl} test{testscript} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} test{testscript} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/sendmail/driver.cxx b/tests/sendmail/driver.cxx index 9e1af96..e48c6b4 100644 --- a/tests/sendmail/driver.cxx +++ b/tests/sendmail/driver.cxx @@ -5,9 +5,9 @@ #include #include -#include -#include // operator<<(ostream, exception) -#include +#include +#include // operator<<(ostream, exception) +#include using namespace std; using namespace butl; diff --git a/tests/sha256/buildfile b/tests/sha256/buildfile index e95e218..0df7668 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{driver} ../../butl/lib{butl} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/sha256/driver.cxx b/tests/sha256/driver.cxx index 10d0335..5686898 100644 --- a/tests/sha256/driver.cxx +++ b/tests/sha256/driver.cxx @@ -6,7 +6,7 @@ #include #include -#include +#include using namespace std; using namespace butl; diff --git a/tests/small-vector/buildfile b/tests/small-vector/buildfile index 12f8603..52285d8 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{driver} ../../butl/lib{butl} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/small-vector/driver.cxx b/tests/small-vector/driver.cxx index f4914de..c7cafd4 100644 --- a/tests/small-vector/driver.cxx +++ b/tests/small-vector/driver.cxx @@ -6,7 +6,7 @@ #include #include -#include +#include using namespace std; using namespace butl; diff --git a/tests/standard-version/buildfile b/tests/standard-version/buildfile index 4afb691..a56ed4d 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{driver} ../../butl/lib{butl} test{testscript} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} test{testscript} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/standard-version/driver.cxx b/tests/standard-version/driver.cxx index 943bd31..fa149ae 100644 --- a/tests/standard-version/driver.cxx +++ b/tests/standard-version/driver.cxx @@ -8,8 +8,8 @@ #include #include // invalid_argument -#include // operator<<(ostream,exception) -#include +#include // operator<<(ostream,exception) +#include using namespace std; using namespace butl; diff --git a/tests/strcase/buildfile b/tests/strcase/buildfile index 329cc2f..a9614f4 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{driver} ../../butl/lib{butl} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/strcase/driver.cxx b/tests/strcase/driver.cxx index 5463811..f7f4bd1 100644 --- a/tests/strcase/driver.cxx +++ b/tests/strcase/driver.cxx @@ -5,7 +5,7 @@ #include #include -#include +#include using namespace std; using namespace butl; diff --git a/tests/string-parser/buildfile b/tests/string-parser/buildfile index 9ccf480..cc680cd 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{driver} ../../butl/lib{butl} test{testscript} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} test{testscript} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/string-parser/driver.cxx b/tests/string-parser/driver.cxx index 2aad3a7..09443f2 100644 --- a/tests/string-parser/driver.cxx +++ b/tests/string-parser/driver.cxx @@ -8,8 +8,8 @@ #include #include -#include // operator<<(ostream,exception) -#include +#include // operator<<(ostream,exception) +#include using namespace std; using namespace butl; diff --git a/tests/tab-parser/buildfile b/tests/tab-parser/buildfile index 4afb691..a56ed4d 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{driver} ../../butl/lib{butl} test{testscript} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} test{testscript} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/tab-parser/driver.cxx b/tests/tab-parser/driver.cxx index 8b0cc4d..238c12a 100644 --- a/tests/tab-parser/driver.cxx +++ b/tests/tab-parser/driver.cxx @@ -6,8 +6,8 @@ #include #include -#include // operator<<(ostream,exception) -#include +#include // operator<<(ostream,exception) +#include using namespace std; using namespace butl; diff --git a/tests/target-triplet/buildfile b/tests/target-triplet/buildfile index ca8365d..5796ca5 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{driver} ../../butl/lib{butl} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/target-triplet/driver.cxx b/tests/target-triplet/driver.cxx index edc422c..8691bac 100644 --- a/tests/target-triplet/driver.cxx +++ b/tests/target-triplet/driver.cxx @@ -6,7 +6,7 @@ #include #include // invalid_argument -#include +#include using namespace std; using namespace butl; diff --git a/tests/timestamp/buildfile b/tests/timestamp/buildfile index 4bb2c18..d6d6865 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{driver} ../../butl/lib{butl} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/timestamp/driver.cxx b/tests/timestamp/driver.cxx index 9161662..f1f33ca 100644 --- a/tests/timestamp/driver.cxx +++ b/tests/timestamp/driver.cxx @@ -12,7 +12,7 @@ #include #include -#include +#include using namespace std; using namespace butl; diff --git a/tests/wildcard/buildfile b/tests/wildcard/buildfile index 7de67f4..fcdd64b 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{driver} ../../butl/lib{butl} test{testscript} +exe{driver}: cxx{driver} ../../libbutl/lib{butl} test{testscript} -include ../../butl/ +include ../../libbutl/ diff --git a/tests/wildcard/driver.cxx b/tests/wildcard/driver.cxx index 5744969..2397fc8 100644 --- a/tests/wildcard/driver.cxx +++ b/tests/wildcard/driver.cxx @@ -9,9 +9,9 @@ #include // sort() #include -#include -#include // operator<<(ostream, exception) -#include +#include +#include // operator<<(ostream, exception) +#include using namespace std; using namespace butl; -- cgit v1.1