diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2009-03-24 12:31:31 -0230 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2009-03-24 12:31:31 -0230 |
| commit | 4cc5d77c383b6c91c3af9fe44df9687bb9b15580 (patch) | |
| tree | 64ce3d6cf35b15497de50f298f7225a8c72f64b6 /java/allTests.py | |
| parent | Merge commit 'origin/R3_3_branch' (diff) | |
| download | ice-4cc5d77c383b6c91c3af9fe44df9687bb9b15580.tar.bz2 ice-4cc5d77c383b6c91c3af9fe44df9687bb9b15580.tar.xz ice-4cc5d77c383b6c91c3af9fe44df9687bb9b15580.zip | |
Merged android-testsuite branch.
Diffstat (limited to 'java/allTests.py')
| -rwxr-xr-x | java/allTests.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/java/allTests.py b/java/allTests.py index 68c2cae18d1..8c8825008fb 100755 --- a/java/allTests.py +++ b/java/allTests.py @@ -21,6 +21,11 @@ sys.path.append(os.path.join(toplevel)) from scripts import * # +# TODO: custom14 is commented out. We need to determine a java2 vs java5 build to determine +# which custom test to run. +# + +# # List of all basic tests. # tests = [ @@ -39,9 +44,10 @@ tests = [ ("Ice/adapterDeactivation", ["core"]), ("Ice/slicing/exceptions", ["core"]), ("Ice/slicing/objects", ["core"]), - ("Ice/custom", ["core"]), + #("Ice/custom14", ["core"]), + ("Ice/custom15", ["core"]), ("Ice/checksum", ["core"]), - ("Ice/package", ["core"]), + ("Ice/packagemd", ["core"]), ("Ice/stream", ["core"]), ("Ice/hold", ["core"]), ("Ice/retry", ["core"]), |