diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-03-23 17:58:52 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-03-23 17:58:52 +0100 |
| commit | 8ef782ceb08419bd756868d417b6236c6833649e (patch) | |
| tree | b03c77a276bd41001aa0b184364dbcc05393f5f4 /scripts/TestUtil.py | |
| parent | Fix for running IceTouch tests (diff) | |
| download | ice-8ef782ceb08419bd756868d417b6236c6833649e.tar.bz2 ice-8ef782ceb08419bd756868d417b6236c6833649e.tar.xz ice-8ef782ceb08419bd756868d417b6236c6833649e.zip | |
Added TestHelper.h for IceTouch/WinRT tests, another fix to TestUtil.py for dealing with ice submodule
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 2f404b07a31..3db18b88143 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -280,11 +280,12 @@ defaultMapping = None testErrors = [] toplevel = None -path = [ "ice", ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", +path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..", "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ] head = os.path.dirname(sys.argv[0]) if len(head) > 0: - path = [os.path.join(head, p) for p in path] + # Try to find scripts/TestUtil.py or ice/scripts/TestUtil.py in parent directories + path = [os.path.join(head, p) for p in path] + [os.path.join(head, p, "ice") 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 RuntimeError("can't find toplevel directory!") |