[asterisk-scf-commits] asterisk-scf/integration/bridging.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Oct 7 21:07:55 CDT 2010
branch "master" has been updated
via 043a91370f522de35e0d588acc4eb9451a497100 (commit)
via 3e3f4c5c6522c14328706e77562b061891e9f30a (commit)
via ff94039281c8fb1738573972692f8e5c34fd07a5 (commit)
from 24cc6270ba5d8b55ee749005e7e35374dd70bd64 (commit)
Summary of changes:
CMakeLists.txt | 10 ++++++----
CMakeSubDirs.txt | 7 -------
config/CMakeLists.txt | 9 +++++++++
.../{test_bridging.conf => test_bridging.conf.in} | 11 ++++++-----
test/CMakeLists.txt | 10 ++++++++--
test/TestBridging.cpp | 3 ++-
test/channel_driver | 2 +-
7 files changed, 32 insertions(+), 20 deletions(-)
delete mode 100644 CMakeSubDirs.txt
create mode 100644 config/CMakeLists.txt
rename config/{test_bridging.conf => test_bridging.conf.in} (71%)
- Log -----------------------------------------------------------------
commit 043a91370f522de35e0d588acc4eb9451a497100
Author: David M. Lee <dlee at digium.com>
Date: Thu Oct 7 17:42:23 2010 -0500
unit tests fully functional
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7afc2ce..0288980 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,6 +26,8 @@ if(NOT integrated_build STREQUAL "true")
set(integrated_build true)
add_subdirectory(logger)
set(integrated_build false)
+else()
+ set(bridging_bindir ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
endif()
add_subdirectory(src)
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index 216d2b8..df5843f 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -6,9 +6,4 @@
# All rights reserved.
#
-configure_file(test_bridging.conf test_bridging.conf)
-
-# component tests only work for integrated builds
-if(integrated_build STREQUAL "true")
- icebox_add_test(bridging_unit_test test_bridging.conf)
-endif()
+configure_file(test_bridging.conf.in test_bridging.conf)
diff --git a/config/test_bridging.conf b/config/test_bridging.conf.in
similarity index 71%
rename from config/test_bridging.conf
rename to config/test_bridging.conf.in
index 615d50b..8dab7c7 100644
--- a/config/test_bridging.conf
+++ b/config/test_bridging.conf.in
@@ -17,11 +17,12 @@ ServiceLocatorManagementProxy=LocatorServiceManagement:tcp -p 55557
TopicManager.Proxy=HydraIceStorm/TopicManager:default -p 55555
-IceBox.Service.Logger=logging-service:createLoggingService --Ice.Config=./test_bridging.conf
-IceBox.Service.TestBridge=bridgeservice:create --Ice.Config=./test_bridging.conf
-IceBox.Service.TestServiceLocator=service_locator:create --Ice.Config=./test_bridging.conf
-IceBox.Service.TestChannel=test_channel:create --Ice.Config=./test_bridging.conf
-IceBox.Service.TestDriver=bridging_unit_test:create --Ice.Config=./test_bridging.conf
+IceBox.InheritProperties=1
+IceBox.Service.Logger=${logger_bindir}/server/src at logging-service:createLoggingService
+IceBox.Service.TestBridge=../src at bridgeservice:create
+IceBox.Service.TestServiceLocator=${service_locator_bindir}/src at service_locator:create
+IceBox.Service.TestChannel=${test_channel_bindir}/src at test_channel:create
+IceBox.Service.TestDriver=../test at bridging_unit_test:create
TestBridge.InstanceName=TestBridge
TestBridge.BridgeService.Endpoints=default -p 55561
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 24a0eda..7905081 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_subdirectory(channel_driver/local_slice)
+if(NOT integrated_build STREQUAL "true")
+ add_subdirectory(channel_driver/local_slice)
+endif()
hydra_component_init(bridging_unit_test CXX)
include_directories("../src")
hydra_component_add_slice(bridging_unit_test EndpointIf)
@@ -28,3 +30,8 @@ include_directories(${logger_dir}/client/src)
hydra_component_build_icebox(bridging_unit_test)
target_link_libraries(bridging_unit_test logging-client)
+
+# component tests only work for integrated builds
+if(integrated_build STREQUAL "true")
+ icebox_add_test(bridging_unit_test ../config/test_bridging.conf)
+endif()
commit 3e3f4c5c6522c14328706e77562b061891e9f30a
Author: David M. Lee <dlee at digium.com>
Date: Thu Oct 7 14:57:31 2010 -0500
Run the unit tests as a part of make test
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52a3605..7afc2ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,10 +25,9 @@ if(NOT integrated_build STREQUAL "true")
# logger is integrated into our build
set(integrated_build true)
add_subdirectory(logger)
+ set(integrated_build false)
endif()
-# Take care of the source code for this project
add_subdirectory(src)
-
-# Finally take care of the test suite
+add_subdirectory(config)
add_subdirectory(test)
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
new file mode 100644
index 0000000..216d2b8
--- /dev/null
+++ b/config/CMakeLists.txt
@@ -0,0 +1,14 @@
+#
+# Asterisk Scalable Communications Framework
+#
+# Copyright (C) 2010 -- Digium, Inc.
+#
+# All rights reserved.
+#
+
+configure_file(test_bridging.conf test_bridging.conf)
+
+# component tests only work for integrated builds
+if(integrated_build STREQUAL "true")
+ icebox_add_test(bridging_unit_test test_bridging.conf)
+endif()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f200682..24a0eda 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -28,4 +28,3 @@ include_directories(${logger_dir}/client/src)
hydra_component_build_icebox(bridging_unit_test)
target_link_libraries(bridging_unit_test logging-client)
-boost_add_test(bridging_unit_test)
diff --git a/test/TestBridging.cpp b/test/TestBridging.cpp
index 26f27be..633b2f7 100644
--- a/test/TestBridging.cpp
+++ b/test/TestBridging.cpp
@@ -422,7 +422,8 @@ public:
{
int argc = globalTestEnvironment->argc();
char** argv = globalTestEnvironment->argv();
- ::boost::unit_test::unit_test_main(&init_unit_test, argc, argv);
+ int r = ::boost::unit_test::unit_test_main(&init_unit_test, argc, argv);
+ exit(r);
Ice::InitializationData initData;
initData.properties = globalTestEnvironment->communicator()->getProperties();
diff --git a/test/channel_driver b/test/channel_driver
index 3b7128d..6f7bcf6 160000
--- a/test/channel_driver
+++ b/test/channel_driver
@@ -1 +1 @@
-Subproject commit 3b7128dd68b00ac105076983517f45d383777bec
+Subproject commit 6f7bcf618f587e939743eb987af205bb5d114835
commit ff94039281c8fb1738573972692f8e5c34fd07a5
Author: David M. Lee <dlee at digium.com>
Date: Thu Oct 7 12:57:58 2010 -0500
Removed CMakeSubDirs.txt, since we now have a better way of handling integrated builds.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6c345d..52a3605 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,8 @@ if(NOT integrated_build STREQUAL "true")
add_subdirectory(logger)
endif()
-# Include the subdirectory information. This is separate so that
-# a higher-level CMakeLists.txt can act as a master for integrated
-# builds.
-include(CMakeSubDirs.txt)
+# Take care of the source code for this project
+add_subdirectory(src)
+
+# Finally take care of the test suite
+add_subdirectory(test)
diff --git a/CMakeSubDirs.txt b/CMakeSubDirs.txt
deleted file mode 100644
index 3348bd6..0000000
--- a/CMakeSubDirs.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- cmake -*-
-
-# Take care of the source code for this project
-add_subdirectory(src)
-
-# Finally take care of the test suite
-add_subdirectory(test)
-----------------------------------------------------------------------
--
asterisk-scf/integration/bridging.git
More information about the asterisk-scf-commits
mailing list