diff options
| author | Jose <jose@zeroc.com> | 2014-12-08 18:23:47 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-12-08 18:23:47 +0100 |
| commit | 7c358454365bf90f59505ccd8dad10c91636c67c (patch) | |
| tree | ab6077f3310d9620ede186b49bdf475eef4dcedc | |
| parent | ICE-6088 - Fix allDemos to work with python 3 (diff) | |
| download | ice-7c358454365bf90f59505ccd8dad10c91636c67c.tar.bz2 ice-7c358454365bf90f59505ccd8dad10c91636c67c.tar.xz ice-7c358454365bf90f59505ccd8dad10c91636c67c.zip | |
remove unnecessary CLASSPATH
| -rw-r--r-- | scripts/IceGridAdmin.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/scripts/IceGridAdmin.py b/scripts/IceGridAdmin.py index 6be258a8c28..ae303fb1ac2 100644 --- a/scripts/IceGridAdmin.py +++ b/scripts/IceGridAdmin.py @@ -228,9 +228,6 @@ def iceGridTest(application, additionalOptions = "", applicationOptions = ""): print return - if TestUtil.getDefaultMapping() == "java": - os.environ['CLASSPATH'] = os.path.join(os.getcwd(), "classes") + os.pathsep + os.environ.get("CLASSPATH", "") - client = TestUtil.getDefaultClientFile() if TestUtil.getDefaultMapping() != "java": client = os.path.join(testdir, client) @@ -282,10 +279,7 @@ def iceGridClientServerTest(additionalClientOptions, additionalServerOptions): client = TestUtil.getDefaultClientFile() if TestUtil.getDefaultMapping() != "java": server = os.path.join(testdir, server) - client = os.path.join(testdir, client) - - if TestUtil.getDefaultMapping() == "java": - os.environ['CLASSPATH'] = os.path.join(os.getcwd(), "classes") + os.pathsep + os.environ.get("CLASSPATH", "") + client = os.path.join(testdir, client) targets = [] if TestUtil.appverifier: |