diff options
Diffstat (limited to 'cpp/test/Freeze/complex/run.py')
| -rwxr-xr-x | cpp/test/Freeze/complex/run.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/cpp/test/Freeze/complex/run.py b/cpp/test/Freeze/complex/run.py index 832ed03d8d7..4ebca7ee050 100755 --- a/cpp/test/Freeze/complex/run.py +++ b/cpp/test/Freeze/complex/run.py @@ -8,7 +8,7 @@ # # ********************************************************************** -import os, sys +import os, sys, os.path for toplevel in [".", "..", "../..", "../../..", "../../../.."]: toplevel = os.path.normpath(toplevel) @@ -18,10 +18,9 @@ else: raise "can't find toplevel directory!" sys.path.append(os.path.join(toplevel, "config")) -import TestUtil +import TestUtil -name = os.path.join("Freeze", "complex") -testdir = os.path.join(toplevel, "test", name) +testdir = os.path.dirname(os.path.abspath(__file__)) # # Clean the contents of the database directory. @@ -32,7 +31,7 @@ TestUtil.cleanDbDir(dbdir) client = os.path.join(testdir, "client") print "starting populate...", -populatePipe = os.popen(client + TestUtil.clientOptions + " --dbdir " + testdir + " populate" + " 2>&1") +populatePipe = TestUtil.startClient(client, " --dbdir " + testdir + " populate" + " 2>&1") print "ok" TestUtil.printOutputFromPipe(populatePipe) @@ -43,7 +42,7 @@ if populateStatus: sys.exit(1) print "starting verification client...", -clientPipe = os.popen(client + TestUtil.clientOptions + " --dbdir " + testdir + " validate" + " 2>&1") +clientPipe = TestUtil.startClient(client, " --dbdir " + testdir + " validate" + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) |