diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2008-08-04 19:18:45 -0230 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2008-08-04 19:18:45 -0230 |
| commit | d9c568300c2aed6ab736026ea116b3f1a72fbe43 (patch) | |
| tree | 27191ba2b0d1ef43256561da01462b98c7bd696d /php/allTests.py | |
| parent | Merge branch 'R3_3_branch' of ssh://cvs.zeroc.com/home/git/ice into R3_3_branch (diff) | |
| download | ice-d9c568300c2aed6ab736026ea116b3f1a72fbe43.tar.bz2 ice-d9c568300c2aed6ab736026ea116b3f1a72fbe43.tar.xz ice-d9c568300c2aed6ab736026ea116b3f1a72fbe43.zip | |
Numerous cleanups to the test suite and expect scripts.
Conflicts:
cpp/test/Glacier2/staticFiltering/run.py
Diffstat (limited to 'php/allTests.py')
| -rwxr-xr-x | php/allTests.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/php/allTests.py b/php/allTests.py index 19221ac2976..b0be0d0e0af 100755 --- a/php/allTests.py +++ b/php/allTests.py @@ -12,13 +12,13 @@ import os, sys, re, getopt for toplevel in [".", "..", "../..", "../../..", "../../../.."]: toplevel = os.path.normpath(toplevel) - if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")): + if os.path.exists(os.path.join(toplevel, "scripts", "TestUtil.py")): break else: raise "can't find toplevel directory!" -sys.path.append(os.path.join(toplevel, "config")) -import TestUtil +sys.path.append(os.path.join(toplevel)) +from scripts import * # # List of all basic tests. |