diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-04-25 11:59:02 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-04-25 11:59:02 +0200 |
| commit | 981759144e754de8150e940ce7de89e6e769660d (patch) | |
| tree | 15154080af508ffa5b3c02c948e636384c84f93a /cpp/test/Ice/inheritance/run.py | |
| parent | Java test and bug fixes (diff) | |
| parent | Removed bogus sl/chat/bin directory (diff) | |
| download | ice-981759144e754de8150e940ce7de89e6e769660d.tar.bz2 ice-981759144e754de8150e940ce7de89e6e769660d.tar.xz ice-981759144e754de8150e940ce7de89e6e769660d.zip | |
Merge remote-tracking branch 'origin/master' into encoding11
Diffstat (limited to 'cpp/test/Ice/inheritance/run.py')
| -rwxr-xr-x | cpp/test/Ice/inheritance/run.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cpp/test/Ice/inheritance/run.py b/cpp/test/Ice/inheritance/run.py index 099ce110107..802eadb48e8 100755 --- a/cpp/test/Ice/inheritance/run.py +++ b/cpp/test/Ice/inheritance/run.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. @@ -16,10 +16,9 @@ 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 * + raise RuntimeError("can't find toplevel directory!") +sys.path.append(os.path.join(path[0], "scripts")) +import TestUtil TestUtil.clientServerTest() TestUtil.collocatedTest() - |