diff options
author | Yohann Roussel <yroussel@google.com> | 2015-02-23 18:05:22 +0100 |
---|---|---|
committer | Yohann Roussel <yroussel@google.com> | 2015-02-23 18:05:22 +0100 |
commit | 5a3347a67437daaae0e42c375ae9b15152c4f672 (patch) | |
tree | 9485ae9070c88c7c0ac1d174adbc747692a8369e | |
parent | c6300f79c97f5cde80aaa0d7b6e349ed691a1e67 (diff) | |
download | toolchain_jack-5a3347a67437daaae0e42c375ae9b15152c4f672.zip toolchain_jack-5a3347a67437daaae0e42c375ae9b15152c4f672.tar.gz toolchain_jack-5a3347a67437daaae0e42c375ae9b15152c4f672.tar.bz2 |
Get rid of shrob.test043
The test was flaky and we found no good way to fix it.
Change-Id: Id5c0470378039c223f5018a9e4023a290f5a5238
6 files changed, 1 insertions, 69 deletions
diff --git a/jack-tests/tests/com/android/jack/shrob/ObfuscationWithoutMappingTests.java b/jack-tests/tests/com/android/jack/shrob/ObfuscationWithoutMappingTests.java index 77bf6d0..bd7030f 100644 --- a/jack-tests/tests/com/android/jack/shrob/ObfuscationWithoutMappingTests.java +++ b/jack-tests/tests/com/android/jack/shrob/ObfuscationWithoutMappingTests.java @@ -44,15 +44,6 @@ public class ObfuscationWithoutMappingTests extends AbstractTest { @Nonnull String flagNumber, @Nonnull String mappingNumber) throws Exception { - runTest(testNumber, flagNumber, mappingNumber, "rot13"); - } - - protected void runTest( - @Nonnull String testNumber, - @Nonnull String flagNumber, - @Nonnull String mappingNumber, - @Nonnull String nameProvider) - throws Exception { String testPackageName = "com.android.jack.shrob.test" + testNumber; File testFolder = AbstractTestTools.getTestRootDir(testPackageName); @@ -63,7 +54,7 @@ public class ObfuscationWithoutMappingTests extends AbstractTest { GrammarActions.parse("proguard.flags" + flagNumber, testFolder.getAbsolutePath(), flags); File refFolder = new File(testFolder, "refsObfuscationWithoutMapping"); - toolchain.addProperty(NameProviderFactory.NAMEPROVIDER.getName(), nameProvider); + toolchain.addProperty(NameProviderFactory.NAMEPROVIDER.getName(), "rot13"); toolchain.addProperty(Options.METHOD_FILTER.getName(), "supported-methods"); File candidateOutputMapping = AbstractTestTools.createTempFile("mapping", ".txt"); @@ -100,12 +91,4 @@ public class ObfuscationWithoutMappingTests extends AbstractTest { public void test35_001() throws Exception { super.test35_001(); } - - @Test - public void test43_001() throws Exception { - /* Use "lower-case" name provider because a rot13 has invalid behavior on sources that would - * allow to reproduce the problem. Using "lower-case" makes it a very fragile test anyway - */ - runTest("043", "001", "", "lower-case"); - } } diff --git a/jack-tests/tests/com/android/jack/shrob/test043/info.txt b/jack-tests/tests/com/android/jack/shrob/test043/info.txt deleted file mode 100644 index 996f0db..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test043/info.txt +++ /dev/null @@ -1,3 +0,0 @@ -This test reproduces an issue when using obfuscation with the "-repackageclasses" flag and a -specific package name. Its goal is to trigger a potential name conflict between renamed types that -end up in the same package.
\ No newline at end of file diff --git a/jack-tests/tests/com/android/jack/shrob/test043/jack/packa/ClassA1.java b/jack-tests/tests/com/android/jack/shrob/test043/jack/packa/ClassA1.java deleted file mode 100644 index 1671e03..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test043/jack/packa/ClassA1.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.jack.shrob.test043.jack.packa; - -public class ClassA1 { - -} diff --git a/jack-tests/tests/com/android/jack/shrob/test043/jack/packb/ClassA1.java b/jack-tests/tests/com/android/jack/shrob/test043/jack/packb/ClassA1.java deleted file mode 100644 index 20752b4..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test043/jack/packb/ClassA1.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.jack.shrob.test043.jack.packb; - -public class ClassA1 { - -} diff --git a/jack-tests/tests/com/android/jack/shrob/test043/proguard.flags001 b/jack-tests/tests/com/android/jack/shrob/test043/proguard.flags001 deleted file mode 100644 index ad8d441..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test043/proguard.flags001 +++ /dev/null @@ -1,2 +0,0 @@ --dontshrink --repackageclasses 'com.android.jack.shrob.test043.jack'
\ No newline at end of file diff --git a/jack-tests/tests/com/android/jack/shrob/test043/refsObfuscationWithoutMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test043/refsObfuscationWithoutMapping/expected-001.txt deleted file mode 100644 index 5725166..0000000 --- a/jack-tests/tests/com/android/jack/shrob/test043/refsObfuscationWithoutMapping/expected-001.txt +++ /dev/null @@ -1,4 +0,0 @@ -com.android.jack.shrob.test043.jack.packa.ClassA1 -> com.android.jack.shrob.test043.jack.a: - void <init>() -> <init> -com.android.jack.shrob.test043.jack.packb.ClassA1 -> com.android.jack.shrob.test043.jack.b: - void <init>() -> <init> |