Move tests into their own folder

4 files changed, 28 insertions, 24 deletions

diff --git a/project2/ice/Jamfile.jam b/project2/ice/Jamfile.jam
index d6cf16f..67e9eab 100644
--- a/project2/ice/Jamfile.jam
+++ b/project2/ice/Jamfile.jam
@@ -1,5 +1,3 @@
-import testing ;
-
 alias glibmm : : : :
 	<cflags>"`pkg-config --cflags glibmm-2.4`"
 	<linkflags>"`pkg-config --libs glibmm-2.4`"
@@ -12,6 +10,8 @@ lib IceUtil ;
 lib pthread ;
 lib boost_filesystem ;
 
+build-project tests ;
+
 cpp-pch pch : pch.hpp :
 	<include>../../libmisc
 	<library>../lib//p2lib
@@ -36,6 +36,7 @@ lib p2iceclient :
 	: :
 	<library>p2ice
 	<library>../common//p2common
+	<include>.
 	;
 
 lib p2icedaemon :
@@ -72,23 +73,3 @@ lib p2ice :
 	<library>boost_filesystem
 	;
 
-lib test :
-	test.ice
-	:
-	<library>Ice
-	<library>IceUtil
-	<library>pthread
-	;
-
-unit-test testClient :
-	[ glob testClient.cpp ]
-	:
-	<dependency>test.ice
-	<library>p2iceclient
-	<library>../ut//p2ut
-	<library>../basics//p2basics
-	<library>Ice
-	<library>IceUtil
-	<library>boost_filesystem
-	;
-
diff --git a/project2/ice/tests/Jamfile.jam b/project2/ice/tests/Jamfile.jam
new file mode 100644
index 0000000..2081be6
--- /dev/null
+++ b/project2/ice/tests/Jamfile.jam
@@ -0,0 +1,22 @@
+import testing ;
+
+lib test :
+	test.ice
+	:
+	<library>..//Ice
+	<library>..//IceUtil
+	<library>..//pthread
+	;
+
+unit-test testClient :
+	[ glob testClient.cpp ]
+	:
+	<dependency>test.ice
+	<library>..//p2iceclient
+	<library>../../ut//p2ut
+	<library>../../basics//p2basics
+	<library>..//Ice
+	<library>..//IceUtil
+	<library>..//boost_filesystem
+	;
+
diff --git a/project2/ice/test.ice b/project2/ice/tests/test.ice
index 3c18999..3c18999 100644
--- a/project2/ice/test.ice
+++ b/project2/ice/tests/test.ice
diff --git a/project2/ice/testClient.cpp b/project2/ice/tests/testClient.cpp
index d7256ae..2cc3651 100644
--- a/project2/ice/testClient.cpp
+++ b/project2/ice/tests/testClient.cpp
@@ -5,6 +5,7 @@
 #include <testOptionsSource.h>
 
 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;
 
 BOOST_AUTO_TEST_CASE( compile_client_full )
@@ -14,7 +15,7 @@ BOOST_AUTO_TEST_CASE( compile_client_full )
 
 	TestOptionsSource::LoadTestOptions({
 			{ "ice.compile.tmpdir", tmpdir },
-			{ "ice.client.slice", "test.ice" }
+			{ "ice.client.slice", (iceroot / "test.ice").string() }
 		});
 }
 
@@ -26,7 +27,7 @@ BOOST_AUTO_TEST_CASE( compile_client_clientOnly )
 	TestOptionsSource::LoadTestOptions({
 			{ "library", (self.parent_path() / "libtest.so").string() },
 			{ "ice.compile.tmpdir", tmpdir },
-			{ "ice.client.sliceclient", "test.ice" }
+			{ "ice.client.sliceclient", (iceroot / "test.ice").string() }
 		});
 }