[asterisk-scf-commits] asterisk-scf/integration/servicediscovery.git branch "icebox" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Oct 1 16:37:47 CDT 2010
branch "icebox" has been updated
via 9aa5a61ddff0d83084767739294067217d6f111c (commit)
via b530a9cbba163036f9e9945f547ba741d014c503 (commit)
via f36e6c505a967173ce4148412e85a1dffc787f65 (commit)
from 597a3dab1506b92d947eb749f5c8e1becceabb52 (commit)
Summary of changes:
cmake | 2 +-
...t_component.config => test_component.config.in} | 4 ++--
test/CMakeLists.txt | 5 +++--
3 files changed, 6 insertions(+), 5 deletions(-)
rename config/{test_component.config => test_component.config.in} (75%)
mode change 100755 => 100644
- Log -----------------------------------------------------------------
commit 9aa5a61ddff0d83084767739294067217d6f111c
Author: David M. Lee <dlee at digium.com>
Date: Fri Oct 1 16:36:48 2010 -0500
Add .in suffix to the test_component.config file, since it's configured by
cmake.
diff --git a/config/test_component.config b/config/test_component.config.in
old mode 100755
new mode 100644
similarity index 100%
rename from config/test_component.config
rename to config/test_component.config.in
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6173dde..fe5540b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -18,7 +18,8 @@ hydra_component_build_icebox(service_locator_test)
icebox_add_test(service_locator_test config/test_component.config)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/IceStorm)
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/HydraIceStorm)
# Copy our test config file to make it available in the test directory.
-configure_file(../config/test_component.config ${CMAKE_CURRENT_BINARY_DIR}/config/test_component.config)
+# CMake does a bit of search-and-replace, as well.
+configure_file(../config/test_component.config.in ${CMAKE_CURRENT_BINARY_DIR}/config/test_component.config)
commit b530a9cbba163036f9e9945f547ba741d014c503
Author: David M. Lee <dlee at digium.com>
Date: Fri Oct 1 16:35:42 2010 -0500
Update to the latest cmake
diff --git a/cmake b/cmake
index c1b57a4..e348824 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit c1b57a49d5fd89a2cd3ed1d347c4e17d6e9fd830
+Subproject commit e3488247f81dfae2695e778565a7c43182836313
commit f36e6c505a967173ce4148412e85a1dffc787f65
Author: David M. Lee <dlee at digium.com>
Date: Fri Oct 1 16:29:29 2010 -0500
Fixed path issue for Ice.Config's.
diff --git a/config/test_component.config b/config/test_component.config
index 123519d..408c913 100755
--- a/config/test_component.config
+++ b/config/test_component.config
@@ -29,7 +29,7 @@ HydraIceStorm.Flush.Timeout=2000
#
# ServiceDiscovery configuration
#
-IceBox.Service.ServiceDiscovery=../src/service_locator:create --Ice.Config=/home/brent/src/asteriskscf/servicediscovery/config/test_component.config
+IceBox.Service.ServiceDiscovery=../src at service_locator:create --Ice.Config=config/test_component.config
# Test endpoints for the service locator management adapter
ServiceLocatorManagementAdapter.Endpoints=tcp -p 4422
@@ -43,7 +43,7 @@ TopicManager.Proxy=HydraIceStorm/TopicManager:default -p 10000
#
# test configuration
#
-IceBox.Service.ServiceDiscoveryTest=./service_locator_test:create --Ice.Config=/home/brent/src/asteriskscf/servicediscovery/config/test_component.config --report_sink=${CMAKE_BINARY_DIR}/service_locator_test-result.xml --report_format=XML --report_level=detailed
+IceBox.Service.ServiceDiscoveryTest=. at service_locator_test:create --Ice.Config=config/test_component.config --report_sink=${CMAKE_BINARY_DIR}/service_locator_test-result.xml --report_format=XML --report_level=detailed
LocatorService.Proxy=LocatorService:tcp -p 4411
ServiceLocatorManagement.proxy=ServiceLocatorManagement:tcp -p 4422
-----------------------------------------------------------------------
--
asterisk-scf/integration/servicediscovery.git
More information about the asterisk-scf-commits
mailing list