diff options
| author | Jose <jose@zeroc.com> | 2009-12-07 21:56:12 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2009-12-07 21:56:12 +0100 |
| commit | 77d178609d5ca53c058ae0fc5c0945bd9d39f96d (patch) | |
| tree | 30f32b68fccec7e8c5aab9f08217ac437e9a9dbc /cpp/demo/Ice/plugin/expect.py | |
| parent | http://bugzilla/bugzilla/show_bug.cgi?id=4410 (diff) | |
| download | ice-77d178609d5ca53c058ae0fc5c0945bd9d39f96d.tar.bz2 ice-77d178609d5ca53c058ae0fc5c0945bd9d39f96d.tar.xz ice-77d178609d5ca53c058ae0fc5c0945bd9d39f96d.zip | |
4350 - cpp/demo/Ice/plugin fails to run if `.' isn't in LD_LIBRARY_PATH
Diffstat (limited to 'cpp/demo/Ice/plugin/expect.py')
| -rwxr-xr-x | cpp/demo/Ice/plugin/expect.py | 7 |
1 files changed, 7 insertions, 0 deletions
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 |