| commit | ca57c409b947bdd4642374ae8d7366e14b2a836e | [log] [tgz] |
|---|---|---|
| author | Wojciech Staszkiewicz <staszkiewicz@google.com> | Mon Sep 19 10:06:09 2016 -0700 |
| committer | Wojciech Staszkiewicz <staszkiewicz@google.com> | Mon Sep 19 15:33:15 2016 -0700 |
| tree | 44f85e41cd4dfe1aa57018f14bc762a234758105 | |
| parent | 7d26164308e9eab5c596a19b841e4ab1c27828a8 [diff] |
Shorten long test names Long Android.run-test.mk targets cause testing framework to misbehave. Issues occur in no-prebuild mode when --output-path parameter generated by the make system is too long. When this happens oat generation fails silently in oat_file_assistant.cc during creation of empty vdex and oat files. Creation fails because file names, which are as long as absolute path to source dex file, are longer than 255 characters Linux file name limit. Because oat generation fails silently affected tests pass even though they were effectively ran in interpreter mode, instead of intended default mode. This CL shortens test names to be at most 35 characters. This helps make the tests more reliable. Test: m test-art-run-test Bug: 31597671 Change-Id: Ic68408ae0c98ffca0c64ca4f5535f4e683a296f0
diff --git a/test/128-reg-spilling-on-implicit-nullcheck/expected.txt b/test/128-reg-spill-on-implicit-nullcheck/expected.txt similarity index 100% rename from test/128-reg-spilling-on-implicit-nullcheck/expected.txt rename to 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 similarity index 100% rename from test/128-reg-spilling-on-implicit-nullcheck/info.txt rename to 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 similarity index 100% rename from test/128-reg-spilling-on-implicit-nullcheck/src/Main.java rename to 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 similarity index 100% rename from test/201-built-in-exception-detail-messages/expected.txt rename to 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 similarity index 100% rename from test/201-built-in-exception-detail-messages/info.txt rename to 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 similarity index 100% rename from test/201-built-in-exception-detail-messages/src/Main.java rename to 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 similarity index 100% rename from test/458-checker-instruction-simplification/expected.txt rename to 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 similarity index 100% rename from test/458-checker-instruction-simplification/info.txt rename to 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 similarity index 100% rename from test/458-checker-instruction-simplification/smali/SmaliTests.smali rename to 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 similarity index 100% rename from test/458-checker-instruction-simplification/src/Main.java rename to 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 similarity index 100% rename from test/462-checker-inlining-across-dex-files/expected.txt rename to 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 similarity index 100% rename from test/462-checker-inlining-across-dex-files/info.txt rename to 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 similarity index 100% rename from test/462-checker-inlining-across-dex-files/multidex.jpp rename to 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 similarity index 100% rename from test/462-checker-inlining-across-dex-files/src-multidex/OtherDex.java rename to 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 similarity index 100% rename from test/462-checker-inlining-across-dex-files/src/Main.java rename to 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 similarity index 100% rename from test/468-checker-bool-simplifier-regression/expected.txt rename to 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 similarity index 100% rename from test/468-checker-bool-simplifier-regression/info.txt rename to 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 similarity index 100% rename from test/468-checker-bool-simplifier-regression/smali/TestCase.smali rename to 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 similarity index 100% rename from test/468-checker-bool-simplifier-regression/src/Main.java rename to 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 similarity index 100% rename from test/477-long-to-float-conversion-precision/expected.txt rename to 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 similarity index 100% rename from test/477-long-to-float-conversion-precision/info.txt rename to 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 similarity index 100% rename from test/477-long-to-float-conversion-precision/src/Main.java rename to 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 similarity index 100% rename from test/496-checker-inlining-and-class-loader/expected.txt rename to 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 similarity index 100% rename from test/496-checker-inlining-and-class-loader/info.txt rename to 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 similarity index 100% rename from test/496-checker-inlining-and-class-loader/src/FirstSeenByMyClassLoader.java rename to 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 similarity index 100% rename from test/496-checker-inlining-and-class-loader/src/Main.java rename to 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 similarity index 100% rename from test/530-checker-regression-reftype-final/expected.txt rename to 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 similarity index 100% rename from test/530-checker-regression-reftype-final/info.txt rename to 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 similarity index 100% rename from test/530-checker-regression-reftype-final/smali/TestCase.smali rename to 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 similarity index 100% rename from test/530-checker-regression-reftype-final/src/Main.java rename to 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 similarity index 100% rename from test/547-regression-trycatch-critical-edge/expected.txt rename to 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 similarity index 100% rename from test/547-regression-trycatch-critical-edge/info.txt rename to 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 similarity index 100% rename from test/547-regression-trycatch-critical-edge/smali/TestCase.smali rename to 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 similarity index 100% rename from test/547-regression-trycatch-critical-edge/src/Main.java rename to 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 similarity index 100% rename from test/557-checker-instruction-simplifier-ror/expected.txt rename to 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 similarity index 100% rename from test/557-checker-instruction-simplifier-ror/info.txt rename to 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 similarity index 100% rename from test/557-checker-instruction-simplifier-ror/src/Main.java rename to 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 similarity index 100% rename from test/580-checker-string-factory-intrinsics/expected.txt rename to 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 similarity index 100% rename from test/580-checker-string-factory-intrinsics/info.txt rename to 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 similarity index 100% rename from test/580-checker-string-factory-intrinsics/src/Main.java rename to 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 similarity index 100% rename from test/588-checker-irreducible-lifetime-hole/expected.txt rename to 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 similarity index 100% rename from test/588-checker-irreducible-lifetime-hole/info.txt rename to 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 similarity index 100% rename from test/588-checker-irreducible-lifetime-hole/smali/IrreducibleLoop.smali rename to 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 similarity index 100% rename from test/588-checker-irreducible-lifetime-hole/src/Main.java rename to 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 similarity index 100% rename from test/590-checker-array-set-null-regression/expected.txt rename to 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 similarity index 100% rename from test/590-checker-array-set-null-regression/info.txt rename to 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 similarity index 100% rename from test/590-checker-array-set-null-regression/src/Main.java rename to 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 similarity index 100% rename from test/593-checker-boolean-to-integral-conv/expected.txt rename to 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 similarity index 100% rename from test/593-checker-boolean-to-integral-conv/info.txt rename to 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 similarity index 100% rename from test/593-checker-boolean-to-integral-conv/src/Main.java rename to 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 similarity index 100% rename from test/593-checker-long-to-float-regression/expected.txt rename to 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 similarity index 100% rename from test/593-checker-long-to-float-regression/info.txt rename to 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 similarity index 100% rename from test/593-checker-long-to-float-regression/src/Main.java rename to 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 similarity index 100% rename from test/961-default-iface-resolution-generated/build rename to 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 similarity index 100% rename from test/961-default-iface-resolution-generated/expected.txt rename to 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 similarity index 100% rename from test/961-default-iface-resolution-generated/info.txt rename to 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 similarity index 100% rename from test/961-default-iface-resolution-generated/util-src/generate_java.py rename to 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 similarity index 100% rename from test/968-default-partial-compile-generated/build rename to 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 similarity index 100% rename from test/968-default-partial-compile-generated/expected.txt rename to 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 similarity index 100% rename from test/968-default-partial-compile-generated/info.txt rename to 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 similarity index 100% rename from test/968-default-partial-compile-generated/util-src/generate_java.py rename to 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 similarity index 100% rename from test/968-default-partial-compile-generated/util-src/generate_smali.py rename to 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 similarity index 100% rename from test/970-iface-super-resolution-generated/build rename to 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 similarity index 100% rename from test/970-iface-super-resolution-generated/expected.txt rename to 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 similarity index 100% rename from test/970-iface-super-resolution-generated/info.txt rename to 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 similarity index 100% rename from test/970-iface-super-resolution-generated/util-src/generate_java.py rename to 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 similarity index 100% rename from test/970-iface-super-resolution-generated/util-src/generate_smali.py rename to 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 e12fd28..f703915 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk
@@ -270,11 +270,11 @@ # 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 @@ # 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)))