diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2015-07-21 01:42:48 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2015-07-21 09:00:28 +0100 |
| commit | 27ff3923e11b3724908dbe073160e5542c92376e (patch) | |
| tree | 1a0a16f9f04228d88c979eb8581a968a893b0808 | |
| parent | Split daemon run into setup, run, teardown to avoid race conditions waiting f... (diff) | |
| download | project2-27ff3923e11b3724908dbe073160e5542c92376e.tar.bz2 project2-27ff3923e11b3724908dbe073160e5542c92376e.tar.xz project2-27ff3923e11b3724908dbe073160e5542c92376e.zip | |
Switch to run rule for capturing output, undate paths in tests
| -rw-r--r-- | project2/ice/unittests/Jamfile.jam | 24 | ||||
| -rw-r--r-- | project2/ice/unittests/testClient.cpp | 1 | ||||
| -rw-r--r-- | project2/ice/unittests/testClientCompile.cpp | 2 | ||||
| -rw-r--r-- | project2/ice/unittests/testDaemon.cpp | 1 | ||||
| -rw-r--r-- | project2/ice/unittests/testDaemonCompile.cpp | 2 |
5 files changed, 18 insertions, 12 deletions
diff --git a/project2/ice/unittests/Jamfile.jam b/project2/ice/unittests/Jamfile.jam index 8e83b1c..4c9f94a 100644 --- a/project2/ice/unittests/Jamfile.jam +++ b/project2/ice/unittests/Jamfile.jam @@ -39,9 +39,9 @@ lib unittestr : path-constant me : . ; -unit-test testClientCompile : +run [ glob testClientCompile.cpp ] - : + : : : <define>ROOT=\"$(me)\" <dependency>unittest.ice <dependency>unittest @@ -53,11 +53,13 @@ unit-test testClientCompile : <library>..//IceUtil <library>..//boost_filesystem <dependency>testClient.xml + : + testClientCompile : ; -unit-test testClient : +run [ glob testClient.cpp ] - : + : : : <define>ROOT=\"$(me)\" <dependency>unittest.ice <library>unittestr @@ -71,11 +73,13 @@ unit-test testClient : <library>..//IceUtil <library>..//boost_filesystem <dependency>testClient.xml + : + testClient : ; -unit-test testDaemonCompile : +run [ glob testDaemonCompile.cpp ] - : + : : : <define>ROOT=\"$(me)\" <dependency>unittest.ice <dependency>unittest @@ -86,11 +90,13 @@ unit-test testDaemonCompile : <library>..//Ice <library>..//IceUtil <library>..//boost_filesystem + : + testDaemonCompile : ; -unit-test testDaemon : +run [ glob testDaemon.cpp ] - : + : : : <define>ROOT=\"$(me)\" <dependency>unittest.ice <library>unittestr @@ -111,5 +117,7 @@ unit-test testDaemon : <dependency>views/UnitTest/SimpleInterface/SomeRowsParams.xml <dependency>views/UnitTestComplex/ComplexInterface/ComplexRow.xml <dependency>tasks/UnitTestComplex/ComplexInterface/ComplexParam.xml + : + testDaemon : ; diff --git a/project2/ice/unittests/testClient.cpp b/project2/ice/unittests/testClient.cpp index 55663a0..87ec04f 100644 --- a/project2/ice/unittests/testClient.cpp +++ b/project2/ice/unittests/testClient.cpp @@ -18,7 +18,6 @@ #define XSTR(s) STR(s) #define STR(s) #s const auto bindir = boost::filesystem::canonical("/proc/self/exe").parent_path(); -const auto componentdir = bindir.parent_path() / "component"; const boost::filesystem::path iceroot(XSTR(ROOT)); const auto headers = iceroot.parent_path().parent_path(); diff --git a/project2/ice/unittests/testClientCompile.cpp b/project2/ice/unittests/testClientCompile.cpp index ef4b0ea..5369884 100644 --- a/project2/ice/unittests/testClientCompile.cpp +++ b/project2/ice/unittests/testClientCompile.cpp @@ -13,8 +13,8 @@ #define XSTR(s) STR(s) #define STR(s) #s const auto bindir = boost::filesystem::canonical("/proc/self/exe").parent_path(); -const auto componentdir = bindir.parent_path() / "component"; const boost::filesystem::path iceroot(XSTR(ROOT)); +const auto componentdir = iceroot / "bin" / bindir.parent_path().leaf() / "component"; const auto headers = iceroot.parent_path().parent_path(); static diff --git a/project2/ice/unittests/testDaemon.cpp b/project2/ice/unittests/testDaemon.cpp index 4015f4a..f12935d 100644 --- a/project2/ice/unittests/testDaemon.cpp +++ b/project2/ice/unittests/testDaemon.cpp @@ -13,7 +13,6 @@ #define XSTR(s) STR(s) #define STR(s) #s const auto bindir = boost::filesystem::canonical("/proc/self/exe").parent_path(); -const auto componentdir = bindir.parent_path() / "component"; const boost::filesystem::path iceroot(XSTR(ROOT)); const auto headers = iceroot.parent_path().parent_path(); diff --git a/project2/ice/unittests/testDaemonCompile.cpp b/project2/ice/unittests/testDaemonCompile.cpp index d93dbf0..95fb6f2 100644 --- a/project2/ice/unittests/testDaemonCompile.cpp +++ b/project2/ice/unittests/testDaemonCompile.cpp @@ -9,8 +9,8 @@ #define XSTR(s) STR(s) #define STR(s) #s const auto bindir = boost::filesystem::canonical("/proc/self/exe").parent_path(); -const auto componentdir = bindir.parent_path() / "component"; const boost::filesystem::path iceroot(XSTR(ROOT)); +const auto componentdir = iceroot / "bin" / bindir.parent_path().leaf() / "component"; const auto headers = iceroot.parent_path().parent_path(); static |