From d9c568300c2aed6ab736026ea116b3f1a72fbe43 Mon Sep 17 00:00:00 2001 From: Matthew Newhook Date: Mon, 4 Aug 2008 19:18:45 -0230 Subject: Numerous cleanups to the test suite and expect scripts. Conflicts: cpp/test/Glacier2/staticFiltering/run.py --- cpp/test/IceSSL/configuration/run.py | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'cpp/test/IceSSL/configuration/run.py') diff --git a/cpp/test/IceSSL/configuration/run.py b/cpp/test/IceSSL/configuration/run.py index 9831ce15e62..ea03f6d3458 100755 --- a/cpp/test/IceSSL/configuration/run.py +++ b/cpp/test/IceSSL/configuration/run.py @@ -10,20 +10,14 @@ import os, sys -for toplevel in [".", "..", "../..", "../../..", "../../../.."]: - toplevel = os.path.normpath(toplevel) - if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")): - break -else: +path = [ ".", "..", "../..", "../../..", "../../../.." ] +head = os.path.dirname(sys.argv[0]) +if len(head) > 0: + path = [os.path.join(head, p) for p in path] +path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] +if len(path) == 0: raise "can't find toplevel directory!" +sys.path.append(os.path.join(path[0])) +from scripts import * -sys.path.append(os.path.join(toplevel, "config")) -import TestUtil -TestUtil.processCmdLine() - -name = os.path.join("IceSSL", "configuration") - -testdir = os.path.dirname(os.path.abspath(__file__)) - -TestUtil.clientServerTestWithOptions(name, "", " " + testdir) -sys.exit(0) +TestUtil.clientServerTest(additionalClientOptions = os.getcwd()) -- cgit v1.2.3