From c4d2ac250aee4102b519ce1db89bde3fe7855639 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 1 May 2017 12:10:35 +0300
Subject: Add hxx extension for headers and lib prefix for library dirs

---
 tests/.gitignore                     | 2 ++
 tests/manifest/buildfile             | 4 ++--
 tests/manifest/driver.cxx            | 2 +-
 tests/package-version/buildfile      | 4 ++--
 tests/package-version/driver.cxx     | 2 +-
 tests/repository-location/buildfile  | 4 ++--
 tests/repository-location/driver.cxx | 2 +-
 7 files changed, 11 insertions(+), 9 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/manifest/buildfile b/tests/manifest/buildfile
index c35024c..ddc5938 100644
--- a/tests/manifest/buildfile
+++ b/tests/manifest/buildfile
@@ -4,6 +4,6 @@
 
 import libs += libbutl%lib{butl}
 
-exe{driver}: cxx{driver} ../../bpkg/lib{bpkg} $libs test{testscript}
+exe{driver}: cxx{driver} ../../libbpkg/lib{bpkg} $libs test{testscript}
 
-include ../../bpkg/
+include ../../libbpkg/
diff --git a/tests/manifest/driver.cxx b/tests/manifest/driver.cxx
index 2b93e5a..157546e 100644
--- a/tests/manifest/driver.cxx
+++ b/tests/manifest/driver.cxx
@@ -10,7 +10,7 @@
 #include <butl/manifest-parser>
 #include <butl/manifest-serializer>
 
-#include <bpkg/manifest>
+#include <libbpkg/manifest.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/package-version/buildfile b/tests/package-version/buildfile
index 9a47c0b..422e92a 100644
--- a/tests/package-version/buildfile
+++ b/tests/package-version/buildfile
@@ -4,6 +4,6 @@
 
 import libs += libbutl%lib{butl}
 
-exe{driver}: cxx{driver} ../../bpkg/lib{bpkg} $libs
+exe{driver}: cxx{driver} ../../libbpkg/lib{bpkg} $libs
 
-include ../../bpkg/
+include ../../libbpkg/
diff --git a/tests/package-version/driver.cxx b/tests/package-version/driver.cxx
index 60460ab..4659db9 100644
--- a/tests/package-version/driver.cxx
+++ b/tests/package-version/driver.cxx
@@ -12,7 +12,7 @@
 #include <butl/utility>  // operator<<(ostream, exception)
 #include <butl/optional>
 
-#include <bpkg/manifest>
+#include <libbpkg/manifest.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/repository-location/buildfile b/tests/repository-location/buildfile
index 54811d3..ecd7da2 100644
--- a/tests/repository-location/buildfile
+++ b/tests/repository-location/buildfile
@@ -4,6 +4,6 @@
 
 import libs += libbutl%lib{butl}
 
-exe{driver}: cxx{driver} ../../bpkg/lib{bpkg} $libs
+exe{driver}: cxx{driver} ../../libbpkg/lib{bpkg} $libs
 
-include ../../bpkg/
+include ../../libbpkg/
diff --git a/tests/repository-location/driver.cxx b/tests/repository-location/driver.cxx
index 953193a..3122393 100644
--- a/tests/repository-location/driver.cxx
+++ b/tests/repository-location/driver.cxx
@@ -13,7 +13,7 @@
 #include <butl/optional>
 #include <butl/manifest-parser>
 
-#include <bpkg/manifest>
+#include <libbpkg/manifest.hxx>
 
 using namespace std;
 using namespace butl;
-- 
cgit v1.1