diff options
| author | Dan Goodliffe <randomdan@riogrande.random.lan> | 2014-11-23 00:39:04 +0000 |
|---|---|---|
| committer | Dan Goodliffe <randomdan@riogrande.random.lan> | 2014-11-23 00:39:04 +0000 |
| commit | e04b96abc912184031dc93e8302069a0cae2b1a8 (patch) | |
| tree | 9311fc5f909ae60242f64cbfe51976ebfb96cb48 | |
| parent | Add .gitignore files (diff) | |
| download | project2-e04b96abc912184031dc93e8302069a0cae2b1a8.tar.bz2 project2-e04b96abc912184031dc93e8302069a0cae2b1a8.tar.xz project2-e04b96abc912184031dc93e8302069a0cae2b1a8.zip | |
Renamed things to avoid conflicts of names
| -rw-r--r-- | project2/ice/Jamfile.jam | 2 | ||||
| -rw-r--r-- | project2/ice/unittests/Jamfile.jam (renamed from project2/ice/tests/Jamfile.jam) | 10 | ||||
| -rw-r--r-- | project2/ice/unittests/testClientCompile.cpp (renamed from project2/ice/tests/testClient.cpp) | 6 | ||||
| -rw-r--r-- | project2/ice/unittests/unittest.ice (renamed from project2/ice/tests/test.ice) | 0 |
4 files changed, 9 insertions, 9 deletions
diff --git a/project2/ice/Jamfile.jam b/project2/ice/Jamfile.jam index 67e9eab..811b5d9 100644 --- a/project2/ice/Jamfile.jam +++ b/project2/ice/Jamfile.jam @@ -10,7 +10,7 @@ lib IceUtil ; lib pthread ; lib boost_filesystem ; -build-project tests ; +build-project unittests ; cpp-pch pch : pch.hpp : <include>../../libmisc diff --git a/project2/ice/tests/Jamfile.jam b/project2/ice/unittests/Jamfile.jam index 976f34d..4c75205 100644 --- a/project2/ice/tests/Jamfile.jam +++ b/project2/ice/unittests/Jamfile.jam @@ -1,7 +1,7 @@ import testing ; -lib test : - test.ice +lib unittest : + unittest.ice : <library>..//Ice <library>..//IceUtil @@ -10,11 +10,11 @@ lib test : path-constant me : . ; -unit-test testClient : - [ glob testClient.cpp ] +unit-test testClientCompile : + [ glob testClientCompile.cpp ] : <define>ROOT=\"$(me)\" - <dependency>test.ice + <dependency>unittest.ice <library>..//p2iceclient <library>../../ut//p2ut <library>../../basics//p2basics diff --git a/project2/ice/tests/testClient.cpp b/project2/ice/unittests/testClientCompile.cpp index 7cd960f..4ae32d0 100644 --- a/project2/ice/tests/testClient.cpp +++ b/project2/ice/unittests/testClientCompile.cpp @@ -16,7 +16,7 @@ BOOST_AUTO_TEST_CASE( compile_client_full ) TestOptionsSource::LoadTestOptions({ { "ice.compile.tmpdir", tmpdir }, - { "ice.client.slice", (iceroot / "test.ice").string() } + { "ice.client.slice", (iceroot / "unittest.ice").string() } }); } @@ -26,9 +26,9 @@ BOOST_AUTO_TEST_CASE( compile_client_clientOnly ) boost::filesystem::remove_all(tmpdir); TestOptionsSource::LoadTestOptions({ - { "library", (self.parent_path() / "libtest.so").string() }, + { "library", (self.parent_path() / "libunittest.so").string() }, { "ice.compile.tmpdir", tmpdir }, - { "ice.client.sliceclient", (iceroot / "test.ice").string() } + { "ice.client.sliceclient", (iceroot / "unittest.ice").string() } }); } diff --git a/project2/ice/tests/test.ice b/project2/ice/unittests/unittest.ice index 3c18999..3c18999 100644 --- a/project2/ice/tests/test.ice +++ b/project2/ice/unittests/unittest.ice |