diff options
| -rwxr-xr-x | test/964-default-iface-init-generated/util-src/generate_smali.py | 12 | ||||
| -rwxr-xr-x | test/run-test | 5 |
2 files changed, 7 insertions, 10 deletions
diff --git a/test/964-default-iface-init-generated/util-src/generate_smali.py b/test/964-default-iface-init-generated/util-src/generate_smali.py index 3c138abf26..c0ba157109 100755 --- a/test/964-default-iface-init-generated/util-src/generate_smali.py +++ b/test/964-default-iface-init-generated/util-src/generate_smali.py @@ -477,12 +477,12 @@ def create_test_classes(): ifaces = [] for sub in split: ifaces.append(list(create_interface_trees(sub))) - for supers in itertools.product(*ifaces): - yield TestClass(clone_all(supers)) - for i in range(len(set(dump_tree(supers)) - set(supers))): - ns = clone_all(supers) - selected = sorted(set(dump_tree(ns)) - set(ns))[i] - yield TestClass(tuple([selected] + list(ns))) + for supers in itertools.product(*ifaces): + yield TestClass(clone_all(supers)) + for i in range(len(set(dump_tree(supers)) - set(supers))): + ns = clone_all(supers) + selected = sorted(set(dump_tree(ns)) - set(ns))[i] + yield TestClass(tuple([selected] + list(ns))) def create_interface_trees(num): """ diff --git a/test/run-test b/test/run-test index 9b0261ed31..b2f6546cb7 100755 --- a/test/run-test +++ b/test/run-test @@ -708,10 +708,7 @@ fi # To cause tests to fail fast, limit the file sizes created by dx, dex2oat and ART output to 2MB. build_file_size_limit=2048 run_file_size_limit=2048 -if echo "$test_dir" | grep 089; then - build_file_size_limit=5120 - run_file_size_limit=5120 -elif echo "$test_dir" | grep 083; then +if echo "$test_dir" | grep -Eq "(083|089|964)" > /dev/null; then build_file_size_limit=5120 run_file_size_limit=5120 fi |