[asterisk-scf-commits] asterisk-scf/integration/ice-util-cpp.git branch "workqueue" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Apr 26 17:00:41 CDT 2011
branch "workqueue" has been updated
via abbd30770385cefed7a7c5490713dc8763476c41 (commit)
via aca711de7b5e4d2fadf3d39807b3487731ab0a08 (commit)
via 48590ab7464a24c520703546a4060cf5acdd24be (commit)
via 11079f2e12fd9eb6cd597ed8c7cb85ca291110f4 (commit)
via 6626b684faccb6679dac6698954f889afde6bb8d (commit)
via a7721c5453e659ac841b63cbfe5ef76cdbe9ecba (commit)
via e8001bdd50f0847b886fa85544e5be4ce85292c5 (commit)
via ff03bb063c8737d5ed3dbb31372269be9080fb1c (commit)
via 2d86b6396e8ae2eee499da8995994e887701d93d (commit)
via cf2f9b9ada6a587a0cb2926c6c5d594eba26be76 (commit)
via d44d47af554d41e1326ae6bbf03fca6cc93cdd32 (commit)
from 2128806347779274465c5efcbc944d6befc02e8c (commit)
Summary of changes:
AmiCollector/test/CMakeLists.txt | 2 +-
AmiCollector/test/TestAmiCollector.h | 4 +-
CMakeLists.txt | 3 +
SmartProxy/include/AsteriskSCF/SmartProxy.h | 50 +++++-------
.../include/AsteriskSCF/StateReplicator.h | 2 +-
StateReplicator/test/CMakeLists.txt | 2 +-
TestFixture/CMakeLists.txt | 16 ++++
TestFixture/include/AsteriskSCF/IceBoxBoostTest.h | 85 ++++++++++++++++++++
.../test.cpp => TestFixture/src/TestFixture.cpp | 5 +-
ThreadPool/test/CMakeLists.txt | 2 +-
WorkQueue/src/DefaultQueueListener.cpp | 2 +-
WorkQueue/test/CMakeLists.txt | 4 +-
12 files changed, 135 insertions(+), 42 deletions(-)
create mode 100644 TestFixture/CMakeLists.txt
create mode 100644 TestFixture/include/AsteriskSCF/IceBoxBoostTest.h
copy AmiCollector/test/test.cpp => TestFixture/src/TestFixture.cpp (86%)
- Log -----------------------------------------------------------------
commit abbd30770385cefed7a7c5490713dc8763476c41
Author: Mark Michelson <mmichelson at digium.com>
Date: Tue Apr 26 16:59:49 2011 -0500
Add a fix where we do not initialize a boolean.
I have no idea why/how tests were passing before this change. Perhaps
GCC initializes bools to false?
diff --git a/WorkQueue/src/DefaultQueueListener.cpp b/WorkQueue/src/DefaultQueueListener.cpp
index 267571c..27d9536 100644
--- a/WorkQueue/src/DefaultQueueListener.cpp
+++ b/WorkQueue/src/DefaultQueueListener.cpp
@@ -51,7 +51,7 @@ public:
* optimiser behaviour that could result in
* an infinite loop.
*/
- bool localDead;
+ bool localDead = false;
while (!localDead)
{
if (!mQueue->executeWork())
commit aca711de7b5e4d2fadf3d39807b3487731ab0a08
Author: Mark Michelson <mmichelson at digium.com>
Date: Tue Apr 26 16:59:04 2011 -0500
Adjust cmake files to deal with the single-build-dir merge.
diff --git a/ThreadPool/test/CMakeLists.txt b/ThreadPool/test/CMakeLists.txt
index c7a2dd0..98172d0 100644
--- a/ThreadPool/test/CMakeLists.txt
+++ b/ThreadPool/test/CMakeLists.txt
@@ -24,4 +24,4 @@ target_link_libraries(ThreadPoolTest asterisk-scf-api)
target_link_libraries(ThreadPoolTest ThreadPool)
target_link_libraries(ThreadPoolTest WorkQueue)
-boost_add_test(ThreadPoolTest)
+asterisk_scf_test_boost(ThreadPoolTest)
diff --git a/WorkQueue/test/CMakeLists.txt b/WorkQueue/test/CMakeLists.txt
index d4adb38..d923f80 100644
--- a/WorkQueue/test/CMakeLists.txt
+++ b/WorkQueue/test/CMakeLists.txt
@@ -28,5 +28,5 @@ asterisk_scf_component_build_standalone(SuspendableWorkQueueTest)
target_link_libraries(SuspendableWorkQueueTest asterisk-scf-api)
target_link_libraries(SuspendableWorkQueueTest WorkQueue)
-boost_add_test(WorkQueueTest)
-boost_add_test(SuspendableWorkQueueTest)
+asterisk_scf_test_boost(WorkQueueTest)
+asterisk_scf_test_boost(SuspendableWorkQueueTest)
commit 48590ab7464a24c520703546a4060cf5acdd24be
Merge: 2128806 11079f2
Author: Mark Michelson <mmichelson at digium.com>
Date: Tue Apr 26 16:53:10 2011 -0500
Merge branch 'master' into workqueue
Conflicts:
CMakeLists.txt
diff --cc CMakeLists.txt
index b728bab,2beaa3d..3eddc14
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -6,5 -8,4 +8,6 @@@ endif(
add_subdirectory(SmartProxy)
add_subdirectory(StateReplicator)
add_subdirectory(AmiCollector)
+add_subdirectory(WorkQueue)
+add_subdirectory(ThreadPool)
+ add_subdirectory(TestFixture)
commit 11079f2e12fd9eb6cd597ed8c7cb85ca291110f4
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Mon Apr 25 17:48:58 2011 -0500
Changes to work with new single-build-directory CMake script.
diff --git a/AmiCollector/test/CMakeLists.txt b/AmiCollector/test/CMakeLists.txt
index 14cf003..e095ba4 100644
--- a/AmiCollector/test/CMakeLists.txt
+++ b/AmiCollector/test/CMakeLists.txt
@@ -10,4 +10,4 @@ asterisk_scf_component_add_boost_libraries(ami-collector-test unit_test_framewor
asterisk_scf_component_build_standalone(ami-collector-test)
-boost_add_test(ami-collector-test)
+asterisk_scf_test_boost(ami-collector-test)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b092bc7..2beaa3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,5 @@
+asterisk_scf_project(ice-util-cpp 3.4)
+
if (integrated_build STREQUAL "true")
set(utils_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
set(utils_bindir ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
diff --git a/StateReplicator/test/CMakeLists.txt b/StateReplicator/test/CMakeLists.txt
index 075f348..43b0f1a 100644
--- a/StateReplicator/test/CMakeLists.txt
+++ b/StateReplicator/test/CMakeLists.txt
@@ -10,4 +10,4 @@ asterisk_scf_component_add_boost_libraries(StateReplicatorTest unit_test_framewo
asterisk_scf_component_build_standalone(StateReplicatorTest)
-boost_add_test(StateReplicatorTest)
+asterisk_scf_test_boost(StateReplicatorTest)
commit 6626b684faccb6679dac6698954f889afde6bb8d
Author: Fred Anderson <fanderson at digium.com>
Date: Tue Apr 26 11:37:31 2011 -0500
Fixed warning message
diff --git a/TestFixture/include/AsteriskSCF/IceBoxBoostTest.h b/TestFixture/include/AsteriskSCF/IceBoxBoostTest.h
index 475d695..8819dc3 100644
--- a/TestFixture/include/AsteriskSCF/IceBoxBoostTest.h
+++ b/TestFixture/include/AsteriskSCF/IceBoxBoostTest.h
@@ -78,7 +78,7 @@ public:
extern "C"
{
-ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr communicator)
+ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
{
return new IceBoxTest;
}
-----------------------------------------------------------------------
--
asterisk-scf/integration/ice-util-cpp.git
More information about the asterisk-scf-commits
mailing list