[asterisk-scf-commits] asterisk-scf/integration/servicediscovery.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  c3ced1377a3c9d60d561af1dcdf047bfbf836410 (commit)
       via  d8b5fd0ff807294e3e8339a73eb4e72763f6d6ae (commit)
       via  9aa5a61ddff0d83084767739294067217d6f111c (commit)
       via  b530a9cbba163036f9e9945f547ba741d014c503 (commit)
       via  f36e6c505a967173ce4148412e85a1dffc787f65 (commit)
       via  597a3dab1506b92d947eb749f5c8e1becceabb52 (commit)
       via  cfe7ba1d0262af2630142f606ebd2d7f6666471d (commit)
       via  a91c6bc36fac5777002733da72f74273cd77a334 (commit)
       via  2fe3ffd3f1232e86edb23988937abbf7625b3dcf (commit)
       via  69e4dc18e2a2664848e1bfb9b0ee68ec0dacd46e (commit)
       via  b9c6c2ab587a65c2607d3303951400ed9e3b255c (commit)
      from  3bb6fbf86fda0fcc479fdd4997e40f4691c078dd (commit)

Summary of changes:
 README.txt                                         |   36 ++++++++----
 cmake                                              |    2 +-
 ...ice_locator.config => test_component.config.in} |   15 ++++-
 config/test_service_locator.config                 |    3 +
 src/CMakeLists.txt                                 |    4 +-
 src/ServiceLocator.cpp                             |   64 +++++++++----------
 test/CMakeLists.txt                                |   12 +++-
 test/TestServiceLocator.cpp                        |   59 ++++++++++++++----
 8 files changed, 131 insertions(+), 64 deletions(-)
 copy config/{test_service_locator.config => test_component.config.in} (67%)


- Log -----------------------------------------------------------------
commit c3ced1377a3c9d60d561af1dcdf047bfbf836410
Author: David M. Lee <dlee at digium.com>
Date:   Mon Oct 4 09:24:40 2010 -0500

    Updating config for running ServiceDiscovery in icebox.

diff --git a/README.txt b/README.txt
index 44c9f0e..95ea4ab 100644
--- a/README.txt
+++ b/README.txt
@@ -10,6 +10,7 @@
 
     1) Build Instructions
     2) Test Instructions
+    3) Running Service Discovery
 
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
@@ -63,5 +64,23 @@ If you need to see the results of the test, pass the ARGS=-V option to make.
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 
+
+-------------------------------------------------------------------------------
+--- 3) Running Service Discovery
+-------------------------------------------------------------------------------
+
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+
+The Service Discovery component is written to be run as an icebox service.
+To run it, the library either needs to be installed into /usr/lib, or
+you need to set LD_LIBRARY_PATH.
+
+On Windows, you would have to install the .dll in the same directory as
+icebox.exe, or set PATH.
+
+    $ LD_LIBRARY_PATH=build/src/ $ICE_HOME/bin/icebox \
+        --Ice.Config=config/test_service_locator.config
+
 ===============================================================================
 ===============================================================================
diff --git a/config/test_service_locator.config b/config/test_service_locator.config
index 47872bd..492a0d5 100644
--- a/config/test_service_locator.config
+++ b/config/test_service_locator.config
@@ -1,4 +1,7 @@
 # This is a configuration file used in conjunction with the service discovery test driver
+
+IceBox.Service.ServiceDiscovery=service_locator:create --Ice.Config=config/test_service_locator.config
+
 HydraIceStorm.InstanceName=HydraIceStorm
 #
 # This property defines the endpoints on which the IceStorm

commit d8b5fd0ff807294e3e8339a73eb4e72763f6d6ae
Author: David M. Lee <dlee at digium.com>
Date:   Mon Oct 4 09:02:11 2010 -0500

    Updated README for running the automated tests.

diff --git a/README.txt b/README.txt
index f3b6a1a..44c9f0e 100644
--- a/README.txt
+++ b/README.txt
@@ -48,22 +48,17 @@ Finally, build the component.
 --- 2) Test Instructions
 -------------------------------------------------------------------------------
 
-First, IceStorm must be started.  This must be started from the
-./config directory, and requires a IceStorm directory.  The command
-below assumes that ICE_HOME is set to your ICE installation, but
-icebox may be on your path.
+The test target in the Makefile is full automated.  From the build directory:
 
-    $ cd config
-    $ mkdir -p IceStorm
-    $ $ICE_HOME/bin/icebox --Ice.Config=test_icestorm.config &
+    $ make test
 
-Next, start service_locator.
+With recent version of Boost, the tests generate a results file
+service_locator_test-result.xml in the build directory.  With older versions
+of boost, the results are sent to stdout.
 
-    $ ../build/src/service_locator --Ice.Config=test_service_locator.config &
+If you need to see the results of the test, pass the ARGS=-V option to make.
 
-Now you can run the unit tests
-
-    $ ../build/test/service_locator_test
+    $ make test ARGS=-V
 
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------

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


-- 
asterisk-scf/integration/servicediscovery.git