summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/demo/Ice/plugin/README2
-rwxr-xr-xcpp/demo/Ice/plugin/expect.py7
2 files changed, 9 insertions, 0 deletions
diff --git a/cpp/demo/Ice/plugin/README b/cpp/demo/Ice/plugin/README
index 583f15c7abb..5972f3052b9 100644
--- a/cpp/demo/Ice/plugin/README
+++ b/cpp/demo/Ice/plugin/README
@@ -15,3 +15,5 @@ servant for this demo.
Please look in the client and sever configuration files to see the
plugin configuration.
+
+Note that in linux the plugin directory should be in your LD_LIBRARY_PATH
diff --git a/cpp/demo/Ice/plugin/expect.py b/cpp/demo/Ice/plugin/expect.py
index f4da233e308..1c80743a4a9 100755
--- a/cpp/demo/Ice/plugin/expect.py
+++ b/cpp/demo/Ice/plugin/expect.py
@@ -22,9 +22,16 @@ sys.path.append(path[0])
from demoscript import *
from demoscript.Ice import plugin
+libraryPath = os.environ["LD_LIBRARY_PATH"];
+if Util.isLinux():
+ os.environ["LD_LIBRARY_PATH"] = libraryPath + ":."
+
server = Util.spawn('./server --Ice.PrintAdapterReady --Ice.Warn.Connections=0')
server.expect('.* ready')
client = Util.spawn('./client --Ice.Warn.Connections=0')
client.expect('.*==>')
plugin.run(client, server)
+
+if Util.isLinux():
+ os.environ["LD_LIBRARY_PATH"] = libraryPath \ No newline at end of file