[asterisk-scf-commits] asterisk-scf/release/bridging.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  30c83a13fdf0bf4746ac55a96e1049c1e1823c0a (commit)
      from  c1096206e872e497212594a0978e60e085c2bd10 (commit)

Summary of changes:
 test/CMakeLists.txt |   64 +++++++++++++++++++++++++-------------------------
 1 files changed, 32 insertions(+), 32 deletions(-)


- Log -----------------------------------------------------------------
commit 30c83a13fdf0bf4746ac55a96e1049c1e1823c0a
Author: Brent Eagles <beagles at digium.com>
Date:   Thu Jan 12 13:51:55 2012 -0330

    Fix test library names to match conventions and test driver configuration.

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 87f5b4b..34ceed8 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -5,37 +5,37 @@ include_directories(../src)
 
 astscf_slice_include_collection(TEST_CHANNEL)
 
-astscf_component_init(bridge_component_test)
+astscf_component_init(BridgeComponentTest)
 astscf_slice_collection(LOCAL PATH "${CMAKE_CURRENT_SOURCE_DIR}")
-astscf_component_add_slices(bridge_component_test TEST_CHANNEL AsteriskSCF/TestChannel/CommandsIf.ice)
-astscf_component_add_slices(bridge_component_test LOCAL TestCookieIf.ice)
-astscf_component_add_files(bridge_component_test TestBridging.cpp)
-astscf_component_add_files(bridge_component_test BridgeListenerI.h)
-astscf_component_add_files(bridge_component_test BridgeListenerI.cpp)
-astscf_component_add_files(bridge_component_test BridgeManagerListenerI.h)
-astscf_component_add_files(bridge_component_test BridgeManagerListenerI.cpp)
-astscf_component_add_files(bridge_component_test TestCommandDriver.cpp)
-astscf_component_add_files(bridge_component_test TestCommandDriver.h)
-astscf_component_add_slices(bridge_component_test PROJECT AsteriskSCF/Replication/BridgeService/BridgeReplicatorIf.ice)
-astscf_component_add_ice_libraries(bridge_component_test IceStorm)
-astscf_component_add_ice_libraries(bridge_component_test IceBox)
-astscf_component_add_boost_libraries(bridge_component_test unit_test_framework thread)
-astscf_component_add_slice_collection_libraries(bridge_component_test ASTSCF TEST_CHANNEL)
-astscf_component_build_icebox(bridge_component_test)
-target_link_libraries(bridge_component_test LoggingClient)
-astscf_test_icebox(bridge_component_test config/test_bridging.conf)
+astscf_component_add_slices(BridgeComponentTest TEST_CHANNEL AsteriskSCF/TestChannel/CommandsIf.ice)
+astscf_component_add_slices(BridgeComponentTest LOCAL TestCookieIf.ice)
+astscf_component_add_files(BridgeComponentTest TestBridging.cpp)
+astscf_component_add_files(BridgeComponentTest BridgeListenerI.h)
+astscf_component_add_files(BridgeComponentTest BridgeListenerI.cpp)
+astscf_component_add_files(BridgeComponentTest BridgeManagerListenerI.h)
+astscf_component_add_files(BridgeComponentTest BridgeManagerListenerI.cpp)
+astscf_component_add_files(BridgeComponentTest TestCommandDriver.cpp)
+astscf_component_add_files(BridgeComponentTest TestCommandDriver.h)
+astscf_component_add_slices(BridgeComponentTest PROJECT AsteriskSCF/Replication/BridgeService/BridgeReplicatorIf.ice)
+astscf_component_add_ice_libraries(BridgeComponentTest IceStorm)
+astscf_component_add_ice_libraries(BridgeComponentTest IceBox)
+astscf_component_add_boost_libraries(BridgeComponentTest unit_test_framework thread)
+astscf_component_add_slice_collection_libraries(BridgeComponentTest ASTSCF TEST_CHANNEL)
+astscf_component_build_icebox(BridgeComponentTest)
+target_link_libraries(BridgeComponentTest LoggingClient)
+astscf_test_icebox(BridgeComponentTest config/test_bridging.conf)
 
-astscf_component_init(bridge_unit_tests)
-astscf_component_add_files(bridge_unit_tests ../src/SessionCollection.cpp)
-astscf_component_add_files(bridge_unit_tests ../src/SessionOperations.cpp)
-astscf_component_add_files(bridge_unit_tests ../src/SessionWrapper.cpp)
-astscf_component_add_files(bridge_unit_tests ../src/MediaSplicer.cpp)
-astscf_component_add_files(bridge_unit_tests ../src/MediaMixer.cpp)
-astscf_component_add_slices(bridge_unit_tests PROJECT AsteriskSCF/Replication/BridgeService/BridgeReplicatorIf.ice)
-astscf_component_add_files(bridge_unit_tests UnitTests.cpp)
-astscf_component_add_ice_libraries(bridge_unit_tests Ice)
-astscf_component_add_boost_libraries(bridge_unit_tests unit_test_framework thread)
-astscf_component_add_slice_collection_libraries(bridge_unit_tests ASTSCF)
-astscf_component_build_standalone(bridge_unit_tests)
-target_link_libraries(bridge_unit_tests LoggingClient)
-astscf_test_boost(bridge_unit_tests)
+astscf_component_init(BridgeUnitTests)
+astscf_component_add_files(BridgeUnitTests ../src/SessionCollection.cpp)
+astscf_component_add_files(BridgeUnitTests ../src/SessionOperations.cpp)
+astscf_component_add_files(BridgeUnitTests ../src/SessionWrapper.cpp)
+astscf_component_add_files(BridgeUnitTests ../src/MediaSplicer.cpp)
+astscf_component_add_files(BridgeUnitTests ../src/MediaMixer.cpp)
+astscf_component_add_slices(BridgeUnitTests PROJECT AsteriskSCF/Replication/BridgeService/BridgeReplicatorIf.ice)
+astscf_component_add_files(BridgeUnitTests UnitTests.cpp)
+astscf_component_add_ice_libraries(BridgeUnitTests Ice)
+astscf_component_add_boost_libraries(BridgeUnitTests unit_test_framework thread)
+astscf_component_add_slice_collection_libraries(BridgeUnitTests ASTSCF)
+astscf_component_build_standalone(BridgeUnitTests)
+target_link_libraries(BridgeUnitTests LoggingClient)
+astscf_test_boost(BridgeUnitTests)

-----------------------------------------------------------------------


-- 
asterisk-scf/release/bridging.git