summaryrefslogtreecommitdiff
path: root/java/allTests.py
diff options
context:
space:
mode:
Diffstat (limited to 'java/allTests.py')
-rwxr-xr-xjava/allTests.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/java/allTests.py b/java/allTests.py
index fef48b08121..65dc7854728 100755
--- a/java/allTests.py
+++ b/java/allTests.py
@@ -12,13 +12,13 @@ import os, sys, re, getopt
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
toplevel = os.path.abspath(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.
@@ -54,7 +54,6 @@ tests = [
("Freeze/evictor", ["core"]),
("Freeze/oldevictor", ["core"]),
("Glacier2/router", ["service"]),
- ("Glacier2/attack", ["service"]),
("IceGrid/simple", ["service"]),
("IceSSL/configuration", ["once"]),
]