68 files changed, 5 insertions, 5 deletions
diff --git a/test/128-reg-spilling-on-implicit-nullcheck/expected.txt b/test/128-reg-spill-on-implicit-nullcheck/expected.txt
index 9bdf658823..9bdf658823 100644
--- a/test/128-reg-spilling-on-implicit-nullcheck/expected.txt
+++ b/test/128-reg-spill-on-implicit-nullcheck/expected.txt
diff --git a/test/128-reg-spilling-on-implicit-nullcheck/info.txt b/test/128-reg-spill-on-implicit-nullcheck/info.txt
index 18b2112268..18b2112268 100644
--- a/test/128-reg-spilling-on-implicit-nullcheck/info.txt
+++ b/test/128-reg-spill-on-implicit-nullcheck/info.txt
diff --git a/test/128-reg-spilling-on-implicit-nullcheck/src/Main.java b/test/128-reg-spill-on-implicit-nullcheck/src/Main.java
index 48276bfd9f..48276bfd9f 100644
--- a/test/128-reg-spilling-on-implicit-nullcheck/src/Main.java
+++ b/test/128-reg-spill-on-implicit-nullcheck/src/Main.java
diff --git a/test/201-built-in-exception-detail-messages/expected.txt b/test/201-built-in-except-detail-messages/expected.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/201-built-in-exception-detail-messages/expected.txt
+++ b/test/201-built-in-except-detail-messages/expected.txt
diff --git a/test/201-built-in-exception-detail-messages/info.txt b/test/201-built-in-except-detail-messages/info.txt
index a01b7277de..a01b7277de 100644
--- a/test/201-built-in-exception-detail-messages/info.txt
+++ b/test/201-built-in-except-detail-messages/info.txt
diff --git a/test/201-built-in-exception-detail-messages/src/Main.java b/test/201-built-in-except-detail-messages/src/Main.java
index dc58819924..dc58819924 100644
--- a/test/201-built-in-exception-detail-messages/src/Main.java
+++ b/test/201-built-in-except-detail-messages/src/Main.java
diff --git a/test/458-checker-instruction-simplification/expected.txt b/test/458-checker-instruct-simplification/expected.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/458-checker-instruction-simplification/expected.txt
+++ b/test/458-checker-instruct-simplification/expected.txt
diff --git a/test/458-checker-instruction-simplification/info.txt b/test/458-checker-instruct-simplification/info.txt
index 09da84b925..09da84b925 100644
--- a/test/458-checker-instruction-simplification/info.txt
+++ b/test/458-checker-instruct-simplification/info.txt
diff --git a/test/458-checker-instruction-simplification/smali/SmaliTests.smali b/test/458-checker-instruct-simplification/smali/SmaliTests.smali
index 6845961f39..6845961f39 100644
--- a/test/458-checker-instruction-simplification/smali/SmaliTests.smali
+++ b/test/458-checker-instruct-simplification/smali/SmaliTests.smali
diff --git a/test/458-checker-instruction-simplification/src/Main.java b/test/458-checker-instruct-simplification/src/Main.java
index 5b1473523b..5b1473523b 100644
--- a/test/458-checker-instruction-simplification/src/Main.java
+++ b/test/458-checker-instruct-simplification/src/Main.java
diff --git a/test/462-checker-inlining-across-dex-files/expected.txt b/test/462-checker-inlining-dex-files/expected.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/462-checker-inlining-across-dex-files/expected.txt
+++ b/test/462-checker-inlining-dex-files/expected.txt
diff --git a/test/462-checker-inlining-across-dex-files/info.txt b/test/462-checker-inlining-dex-files/info.txt
index 57008c39e1..57008c39e1 100644
--- a/test/462-checker-inlining-across-dex-files/info.txt
+++ b/test/462-checker-inlining-dex-files/info.txt
diff --git a/test/462-checker-inlining-across-dex-files/multidex.jpp b/test/462-checker-inlining-dex-files/multidex.jpp
index ae554566cb..ae554566cb 100644
--- a/test/462-checker-inlining-across-dex-files/multidex.jpp
+++ b/test/462-checker-inlining-dex-files/multidex.jpp
diff --git a/test/462-checker-inlining-across-dex-files/src-multidex/OtherDex.java b/test/462-checker-inlining-dex-files/src-multidex/OtherDex.java
index 2056e2f2aa..2056e2f2aa 100644
--- a/test/462-checker-inlining-across-dex-files/src-multidex/OtherDex.java
+++ b/test/462-checker-inlining-dex-files/src-multidex/OtherDex.java
diff --git a/test/462-checker-inlining-across-dex-files/src/Main.java b/test/462-checker-inlining-dex-files/src/Main.java
index c2bb479468..c2bb479468 100644
--- a/test/462-checker-inlining-across-dex-files/src/Main.java
+++ b/test/462-checker-inlining-dex-files/src/Main.java
diff --git a/test/468-checker-bool-simplifier-regression/expected.txt b/test/468-checker-bool-simplif-regression/expected.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/468-checker-bool-simplifier-regression/expected.txt
+++ b/test/468-checker-bool-simplif-regression/expected.txt
diff --git a/test/468-checker-bool-simplifier-regression/info.txt b/test/468-checker-bool-simplif-regression/info.txt
index 0a465846b1..0a465846b1 100644
--- a/test/468-checker-bool-simplifier-regression/info.txt
+++ b/test/468-checker-bool-simplif-regression/info.txt
diff --git a/test/468-checker-bool-simplifier-regression/smali/TestCase.smali b/test/468-checker-bool-simplif-regression/smali/TestCase.smali
index 87ad21ead4..87ad21ead4 100644
--- a/test/468-checker-bool-simplifier-regression/smali/TestCase.smali
+++ b/test/468-checker-bool-simplif-regression/smali/TestCase.smali
diff --git a/test/468-checker-bool-simplifier-regression/src/Main.java b/test/468-checker-bool-simplif-regression/src/Main.java
index 8fe05c7a8a..8fe05c7a8a 100644
--- a/test/468-checker-bool-simplifier-regression/src/Main.java
+++ b/test/468-checker-bool-simplif-regression/src/Main.java
diff --git a/test/477-long-to-float-conversion-precision/expected.txt b/test/477-long-2-float-convers-precision/expected.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/477-long-to-float-conversion-precision/expected.txt
+++ b/test/477-long-2-float-convers-precision/expected.txt
diff --git a/test/477-long-to-float-conversion-precision/info.txt b/test/477-long-2-float-convers-precision/info.txt
index 1e07cf3f0b..1e07cf3f0b 100644
--- a/test/477-long-to-float-conversion-precision/info.txt
+++ b/test/477-long-2-float-convers-precision/info.txt
diff --git a/test/477-long-to-float-conversion-precision/src/Main.java b/test/477-long-2-float-convers-precision/src/Main.java
index 568bc04d6c..568bc04d6c 100644
--- a/test/477-long-to-float-conversion-precision/src/Main.java
+++ b/test/477-long-2-float-convers-precision/src/Main.java
diff --git a/test/496-checker-inlining-and-class-loader/expected.txt b/test/496-checker-inlining-class-loader/expected.txt
index 312c28f8b0..312c28f8b0 100644
--- a/test/496-checker-inlining-and-class-loader/expected.txt
+++ b/test/496-checker-inlining-class-loader/expected.txt
diff --git a/test/496-checker-inlining-and-class-loader/info.txt b/test/496-checker-inlining-class-loader/info.txt
index aa4b256207..aa4b256207 100644
--- a/test/496-checker-inlining-and-class-loader/info.txt
+++ b/test/496-checker-inlining-class-loader/info.txt
diff --git a/test/496-checker-inlining-and-class-loader/src/FirstSeenByMyClassLoader.java b/test/496-checker-inlining-class-loader/src/FirstSeenByMyClassLoader.java
index e97b4e3391..e97b4e3391 100644
--- a/test/496-checker-inlining-and-class-loader/src/FirstSeenByMyClassLoader.java
+++ b/test/496-checker-inlining-class-loader/src/FirstSeenByMyClassLoader.java
diff --git a/test/496-checker-inlining-and-class-loader/src/Main.java b/test/496-checker-inlining-class-loader/src/Main.java
index 15d4dc07bc..15d4dc07bc 100644
--- a/test/496-checker-inlining-and-class-loader/src/Main.java
+++ b/test/496-checker-inlining-class-loader/src/Main.java
diff --git a/test/530-checker-regression-reftype-final/expected.txt b/test/530-checker-regression-reftyp-final/expected.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/530-checker-regression-reftype-final/expected.txt
+++ b/test/530-checker-regression-reftyp-final/expected.txt
diff --git a/test/530-checker-regression-reftype-final/info.txt b/test/530-checker-regression-reftyp-final/info.txt
index 07789d6e9e..07789d6e9e 100644
--- a/test/530-checker-regression-reftype-final/info.txt
+++ b/test/530-checker-regression-reftyp-final/info.txt
diff --git a/test/530-checker-regression-reftype-final/smali/TestCase.smali b/test/530-checker-regression-reftyp-final/smali/TestCase.smali
index 44facfca05..44facfca05 100644
--- a/test/530-checker-regression-reftype-final/smali/TestCase.smali
+++ b/test/530-checker-regression-reftyp-final/smali/TestCase.smali
diff --git a/test/530-checker-regression-reftype-final/src/Main.java b/test/530-checker-regression-reftyp-final/src/Main.java
index f86b515cae..f86b515cae 100644
--- a/test/530-checker-regression-reftype-final/src/Main.java
+++ b/test/530-checker-regression-reftyp-final/src/Main.java
diff --git a/test/547-regression-trycatch-critical-edge/expected.txt b/test/547-regression-trycatch-critic-edge/expected.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/547-regression-trycatch-critical-edge/expected.txt
+++ b/test/547-regression-trycatch-critic-edge/expected.txt
diff --git a/test/547-regression-trycatch-critical-edge/info.txt b/test/547-regression-trycatch-critic-edge/info.txt
index dc798c0016..dc798c0016 100644
--- a/test/547-regression-trycatch-critical-edge/info.txt
+++ b/test/547-regression-trycatch-critic-edge/info.txt
diff --git a/test/547-regression-trycatch-critical-edge/smali/TestCase.smali b/test/547-regression-trycatch-critic-edge/smali/TestCase.smali
index 53a3cc5b62..53a3cc5b62 100644
--- a/test/547-regression-trycatch-critical-edge/smali/TestCase.smali
+++ b/test/547-regression-trycatch-critic-edge/smali/TestCase.smali
diff --git a/test/547-regression-trycatch-critical-edge/src/Main.java b/test/547-regression-trycatch-critic-edge/src/Main.java
index 8eddac3fea..8eddac3fea 100644
--- a/test/547-regression-trycatch-critical-edge/src/Main.java
+++ b/test/547-regression-trycatch-critic-edge/src/Main.java
diff --git a/test/557-checker-instruction-simplifier-ror/expected.txt b/test/557-checker-instruct-simplifier-ror/expected.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/557-checker-instruction-simplifier-ror/expected.txt
+++ b/test/557-checker-instruct-simplifier-ror/expected.txt
diff --git a/test/557-checker-instruction-simplifier-ror/info.txt b/test/557-checker-instruct-simplifier-ror/info.txt
index f9a86f8009..f9a86f8009 100644
--- a/test/557-checker-instruction-simplifier-ror/info.txt
+++ b/test/557-checker-instruct-simplifier-ror/info.txt
diff --git a/test/557-checker-instruction-simplifier-ror/src/Main.java b/test/557-checker-instruct-simplifier-ror/src/Main.java
index 0e3d14518a..0e3d14518a 100644
--- a/test/557-checker-instruction-simplifier-ror/src/Main.java
+++ b/test/557-checker-instruct-simplifier-ror/src/Main.java
diff --git a/test/580-checker-string-factory-intrinsics/expected.txt b/test/580-checker-string-fact-intrinsics/expected.txt
index 86e041dad6..86e041dad6 100644
--- a/test/580-checker-string-factory-intrinsics/expected.txt
+++ b/test/580-checker-string-fact-intrinsics/expected.txt
diff --git a/test/580-checker-string-factory-intrinsics/info.txt b/test/580-checker-string-fact-intrinsics/info.txt
index 3d01a1964a..3d01a1964a 100644
--- a/test/580-checker-string-factory-intrinsics/info.txt
+++ b/test/580-checker-string-fact-intrinsics/info.txt
diff --git a/test/580-checker-string-factory-intrinsics/src/Main.java b/test/580-checker-string-fact-intrinsics/src/Main.java
index a2e34bffd0..a2e34bffd0 100644
--- a/test/580-checker-string-factory-intrinsics/src/Main.java
+++ b/test/580-checker-string-fact-intrinsics/src/Main.java
diff --git a/test/588-checker-irreducible-lifetime-hole/expected.txt b/test/588-checker-irreducib-lifetime-hole/expected.txt
index aab200982b..aab200982b 100644
--- a/test/588-checker-irreducible-lifetime-hole/expected.txt
+++ b/test/588-checker-irreducib-lifetime-hole/expected.txt
diff --git a/test/588-checker-irreducible-lifetime-hole/info.txt b/test/588-checker-irreducib-lifetime-hole/info.txt
index a2861a9fd5..a2861a9fd5 100644
--- a/test/588-checker-irreducible-lifetime-hole/info.txt
+++ b/test/588-checker-irreducib-lifetime-hole/info.txt
diff --git a/test/588-checker-irreducible-lifetime-hole/smali/IrreducibleLoop.smali b/test/588-checker-irreducib-lifetime-hole/smali/IrreducibleLoop.smali
index 186f0ab3e8..186f0ab3e8 100644
--- a/test/588-checker-irreducible-lifetime-hole/smali/IrreducibleLoop.smali
+++ b/test/588-checker-irreducib-lifetime-hole/smali/IrreducibleLoop.smali
diff --git a/test/588-checker-irreducible-lifetime-hole/src/Main.java b/test/588-checker-irreducib-lifetime-hole/src/Main.java
index 98565b103a..98565b103a 100644
--- a/test/588-checker-irreducible-lifetime-hole/src/Main.java
+++ b/test/588-checker-irreducib-lifetime-hole/src/Main.java
diff --git a/test/590-checker-array-set-null-regression/expected.txt b/test/590-checker-arr-set-null-regression/expected.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/590-checker-array-set-null-regression/expected.txt
+++ b/test/590-checker-arr-set-null-regression/expected.txt
diff --git a/test/590-checker-array-set-null-regression/info.txt b/test/590-checker-arr-set-null-regression/info.txt
index fe173a334d..fe173a334d 100644
--- a/test/590-checker-array-set-null-regression/info.txt
+++ b/test/590-checker-arr-set-null-regression/info.txt
diff --git a/test/590-checker-array-set-null-regression/src/Main.java b/test/590-checker-arr-set-null-regression/src/Main.java
index 792ee4ecd6..792ee4ecd6 100644
--- a/test/590-checker-array-set-null-regression/src/Main.java
+++ b/test/590-checker-arr-set-null-regression/src/Main.java
diff --git a/test/593-checker-boolean-to-integral-conv/expected.txt b/test/593-checker-boolean-2-integral-conv/expected.txt
index b0aad4deb5..b0aad4deb5 100644
--- a/test/593-checker-boolean-to-integral-conv/expected.txt
+++ b/test/593-checker-boolean-2-integral-conv/expected.txt
diff --git a/test/593-checker-boolean-to-integral-conv/info.txt b/test/593-checker-boolean-2-integral-conv/info.txt
index 2d883c77ee..2d883c77ee 100644
--- a/test/593-checker-boolean-to-integral-conv/info.txt
+++ b/test/593-checker-boolean-2-integral-conv/info.txt
diff --git a/test/593-checker-boolean-to-integral-conv/src/Main.java b/test/593-checker-boolean-2-integral-conv/src/Main.java
index b4c91c8db6..b4c91c8db6 100644
--- a/test/593-checker-boolean-to-integral-conv/src/Main.java
+++ b/test/593-checker-boolean-2-integral-conv/src/Main.java
diff --git a/test/593-checker-long-to-float-regression/expected.txt b/test/593-checker-long-2-float-regression/expected.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/593-checker-long-to-float-regression/expected.txt
+++ b/test/593-checker-long-2-float-regression/expected.txt
diff --git a/test/593-checker-long-to-float-regression/info.txt b/test/593-checker-long-2-float-regression/info.txt
index 39402e9cdd..39402e9cdd 100644
--- a/test/593-checker-long-to-float-regression/info.txt
+++ b/test/593-checker-long-2-float-regression/info.txt
diff --git a/test/593-checker-long-to-float-regression/src/Main.java b/test/593-checker-long-2-float-regression/src/Main.java
index 9c07f3d692..9c07f3d692 100644
--- a/test/593-checker-long-to-float-regression/src/Main.java
+++ b/test/593-checker-long-2-float-regression/src/Main.java
diff --git a/test/961-default-iface-resolution-generated/build b/test/961-default-iface-resolut-generated/build
index ccebbe4ac9..ccebbe4ac9 100755
--- a/test/961-default-iface-resolution-generated/build
+++ b/test/961-default-iface-resolut-generated/build
diff --git a/test/961-default-iface-resolution-generated/expected.txt b/test/961-default-iface-resolut-generated/expected.txt
index 1ddd65d177..1ddd65d177 100644
--- a/test/961-default-iface-resolution-generated/expected.txt
+++ b/test/961-default-iface-resolut-generated/expected.txt
diff --git a/test/961-default-iface-resolution-generated/info.txt b/test/961-default-iface-resolut-generated/info.txt
index 2cd2cc75b7..2cd2cc75b7 100644
--- a/test/961-default-iface-resolution-generated/info.txt
+++ b/test/961-default-iface-resolut-generated/info.txt
diff --git a/test/961-default-iface-resolution-generated/util-src/generate_java.py b/test/961-default-iface-resolut-generated/util-src/generate_java.py
index a205cd6ce0..a205cd6ce0 100755
--- a/test/961-default-iface-resolution-generated/util-src/generate_java.py
+++ b/test/961-default-iface-resolut-generated/util-src/generate_java.py
diff --git a/test/968-default-partial-compile-generated/build b/test/968-default-part-compile-generated/build
index 1e9f8aadd5..1e9f8aadd5 100755
--- a/test/968-default-partial-compile-generated/build
+++ b/test/968-default-part-compile-generated/build
diff --git a/test/968-default-partial-compile-generated/expected.txt b/test/968-default-part-compile-generated/expected.txt
index 1ddd65d177..1ddd65d177 100644
--- a/test/968-default-partial-compile-generated/expected.txt
+++ b/test/968-default-part-compile-generated/expected.txt
diff --git a/test/968-default-partial-compile-generated/info.txt b/test/968-default-part-compile-generated/info.txt
index bc1c42816e..bc1c42816e 100644
--- a/test/968-default-partial-compile-generated/info.txt
+++ b/test/968-default-part-compile-generated/info.txt
diff --git a/test/968-default-partial-compile-generated/util-src/generate_java.py b/test/968-default-part-compile-generated/util-src/generate_java.py
index 35290efe1d..35290efe1d 100755
--- a/test/968-default-partial-compile-generated/util-src/generate_java.py
+++ b/test/968-default-part-compile-generated/util-src/generate_java.py
diff --git a/test/968-default-partial-compile-generated/util-src/generate_smali.py b/test/968-default-part-compile-generated/util-src/generate_smali.py
index 9855bcf854..9855bcf854 100755
--- a/test/968-default-partial-compile-generated/util-src/generate_smali.py
+++ b/test/968-default-part-compile-generated/util-src/generate_smali.py
diff --git a/test/970-iface-super-resolution-generated/build b/test/970-iface-superresolution-generated/build
index fd1b271c1c..fd1b271c1c 100755
--- a/test/970-iface-super-resolution-generated/build
+++ b/test/970-iface-superresolution-generated/build
diff --git a/test/970-iface-super-resolution-generated/expected.txt b/test/970-iface-superresolution-generated/expected.txt
index 1ddd65d177..1ddd65d177 100644
--- a/test/970-iface-super-resolution-generated/expected.txt
+++ b/test/970-iface-superresolution-generated/expected.txt
diff --git a/test/970-iface-super-resolution-generated/info.txt b/test/970-iface-superresolution-generated/info.txt
index 2cd2cc75b7..2cd2cc75b7 100644
--- a/test/970-iface-super-resolution-generated/info.txt
+++ b/test/970-iface-superresolution-generated/info.txt
diff --git a/test/970-iface-super-resolution-generated/util-src/generate_java.py b/test/970-iface-superresolution-generated/util-src/generate_java.py
index c12f10d790..c12f10d790 100755
--- a/test/970-iface-super-resolution-generated/util-src/generate_java.py
+++ b/test/970-iface-superresolution-generated/util-src/generate_java.py
diff --git a/test/970-iface-super-resolution-generated/util-src/generate_smali.py b/test/970-iface-superresolution-generated/util-src/generate_smali.py
index cb7b0fa4f2..cb7b0fa4f2 100755
--- a/test/970-iface-super-resolution-generated/util-src/generate_smali.py
+++ b/test/970-iface-superresolution-generated/util-src/generate_smali.py
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index e12fd285d4..f70391543a 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -270,11 +270,11 @@ TEST_ART_BROKEN_TARGET_TESTS :=
 # Tests that require python3.
 TEST_ART_PYTHON3_DEPENDENCY_RUN_TESTS := \
   960-default-smali \
-  961-default-iface-resolution-generated \
+  961-default-iface-resolut-generated \
   964-default-iface-init-generated \
-  968-default-partial-compile-generated \
+  968-default-part-compile-generated \
   969-iface-super \
-  970-iface-super-resolution-generated \
+  970-iface-superresolution-generated \
   971-iface-super
 
 # Check if we have python3 to run our tests.
@@ -354,12 +354,12 @@ TEST_ART_BROKEN_INTERPRETER_ACCESS_CHECK_TESTS :=
 # Tests that are broken with GC stress.
 # * 137-cfi needs to unwind a second forked process. We're using a primitive sleep to wait till we
 #   hope the second process got into the expected state. The slowness of gcstress makes this bad.
-# * 961-default-iface-resolution-generated and 964-default-iface-init-generated are very long tests
+# * 961-default-iface-resolut-generated and 964-default-iface-init-generated are very long tests
 #   that often will take more than the timeout to run when gcstress is enabled. This is because
 #   gcstress slows down allocations significantly which these tests do a lot.
 TEST_ART_BROKEN_GCSTRESS_RUN_TESTS := \
   137-cfi \
-  961-default-iface-resolution-generated \
+  961-default-iface-resolut-generated \
   964-default-iface-init-generated
 
 ifneq (,$(filter gcstress,$(GC_TYPES)))