diff options
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index b4ecb3ebe9a..5eda3d9c885 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -19,7 +19,6 @@ mono = False # Set to True when not on Windows keepGoing = False # Set to True to have the tests continue on failure. ipv6 = False # Default to use IPv4 only socksProxy = False # Use SOCKS proxy running on localhost -iceHome = None # Binary distribution to use (None to use binaries from source distribution) global x64 x64 = False # Binary distribution is 64-bit global x86 @@ -49,7 +48,7 @@ global serverOnly serverOnly = False mx = False -global linuxDistribution +linuxDistribution = None if os.path.isfile("/etc/issue"): f = open("/etc/issue", "r") issue = f.read() @@ -65,6 +64,14 @@ if os.path.isfile("/etc/issue"): elif issue.find("SUSE Linux") != -1: linuxDistribution = "SUSE LINUX" +iceHome = None # Binary distribution to use (or None to use binaries from source distribution) +if os.environ.get("USE_BIN_DIST", "no") == "yes": + # Only use binary distribution from ICE_HOME environment variable if USE_BIN_DIST=yes + if os.environ.get("ICE_HOME", "") != "": + iceHome = os.environ["ICE_HOME"] + elif isLinux(): + iceHome = "/usr" + def isCygwin(): # The substring on sys.platform is required because some cygwin # versions return variations like "cygwin_nt-4.01". @@ -2029,13 +2036,6 @@ def processCmdLine(): if len(args) > 0: usage() - # Only use binary distribution from ICE_HOME environment variable if USE_BIN_DIST=yes - if not iceHome and os.environ.get("USE_BIN_DIST", "no") == "yes": - if os.environ.get("ICE_HOME", "") != "": - iceHome = os.environ["ICE_HOME"] - elif isLinux(): - iceHome = "/usr" - if iceHome: sys.stdout.write("*** using Ice installation from " + iceHome + " ") else: |