diff options
| author | randomdan <randomdan@localhost> | 2014-11-13 23:39:54 +0000 |
|---|---|---|
| committer | randomdan <randomdan@localhost> | 2014-11-13 23:39:54 +0000 |
| commit | 24cce75474f61d2169e53851064c835982e1d4aa (patch) | |
| tree | 2910d57e98a53b599eb6a9cb680e5b7193fd64a6 | |
| parent | Fix quirk (from glibc update?) around fields in struct tm and the _BSD_SOURCE... (diff) | |
| download | project2-24cce75474f61d2169e53851064c835982e1d4aa.tar.bz2 project2-24cce75474f61d2169e53851064c835982e1d4aa.tar.xz project2-24cce75474f61d2169e53851064c835982e1d4aa.zip | |
Scattering of fixes to remove hacks around paths and fix running the build from folders other than the project root
| -rw-r--r-- | project2/ice/tests/Jamfile.jam | 3 | ||||
| -rw-r--r-- | project2/ice/tests/testClient.cpp | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/project2/ice/tests/Jamfile.jam b/project2/ice/tests/Jamfile.jam index 2081be6..976f34d 100644 --- a/project2/ice/tests/Jamfile.jam +++ b/project2/ice/tests/Jamfile.jam @@ -8,9 +8,12 @@ lib test : <library>..//pthread ; +path-constant me : . ; + unit-test testClient : [ glob testClient.cpp ] : + <define>ROOT=\"$(me)\" <dependency>test.ice <library>..//p2iceclient <library>../../ut//p2ut diff --git a/project2/ice/tests/testClient.cpp b/project2/ice/tests/testClient.cpp index 2cc3651..7cd960f 100644 --- a/project2/ice/tests/testClient.cpp +++ b/project2/ice/tests/testClient.cpp @@ -4,9 +4,10 @@ #include "iceClient.h" #include <testOptionsSource.h> +#define XSTR(s) STR(s) +#define STR(s) #s const auto self = boost::filesystem::canonical("/proc/self/exe"); -const auto iceroot = self.parent_path().parent_path().parent_path().parent_path(); -const Glib::ustring testPlatform; +const boost::filesystem::path iceroot(XSTR(ROOT)); BOOST_AUTO_TEST_CASE( compile_client_full ) { |