From b9131b191567e984a5f3a1d125b36014b67b47b6 Mon Sep 17 00:00:00 2001 From: Sebastien Hertz Date: Tue, 22 Mar 2016 08:32:34 +0100 Subject: Update run-test 097-duplicate-method Runs the test with a precompiled classes.dex and re-enables it. We need to build a dex file with duplicate methods. We cannot do that with Jack (this is invalid) or smali (it does not keep duplicate methods, only one is in the dex). Therefore, having a precompiled dex file allows to run the test on whatever toolchain. In the future, we could update the test if a tool allows to generate it again. Change-Id: I3803aa0c2e99ca61d58b36e088d9bbe199e07d3c --- test/097-duplicate-method/src/Main.java | 28 ---------------------------- test/097-duplicate-method/src/Test.j | 29 ----------------------------- test/097-duplicate-method/src/Test.java | 24 ------------------------ 3 files changed, 81 deletions(-) delete mode 100644 test/097-duplicate-method/src/Main.java delete mode 100644 test/097-duplicate-method/src/Test.j delete mode 100644 test/097-duplicate-method/src/Test.java (limited to 'test/097-duplicate-method/src') diff --git a/test/097-duplicate-method/src/Main.java b/test/097-duplicate-method/src/Main.java deleted file mode 100644 index bb3d36ad5b..0000000000 --- a/test/097-duplicate-method/src/Main.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2012 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. - */ - -/** - * Certain class files generated by smali can have encoded methods with an - * identical method_idx. In these cases, the behavior should be to only use the - * first one, and to ignore all following duplicates. - */ -public class Main { - public static void main(String args[]) { - if (Test.run() != null) { - System.out.println("Success!"); - } - } -} diff --git a/test/097-duplicate-method/src/Test.j b/test/097-duplicate-method/src/Test.j deleted file mode 100644 index f96a9a3062..0000000000 --- a/test/097-duplicate-method/src/Test.j +++ /dev/null @@ -1,29 +0,0 @@ -; Copyright (C) 2012 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. - -.class Test -.super java/lang/Object - -.method public static run()Ljava/lang/Object; - .limit stack 2 - new java/lang/Object - dup - invokespecial java/lang/Object/()V - areturn -.end method - -.method public static run()Ljava/lang/Object; - aconst_null - areturn -.end method diff --git a/test/097-duplicate-method/src/Test.java b/test/097-duplicate-method/src/Test.java deleted file mode 100644 index 7dd61e6928..0000000000 --- a/test/097-duplicate-method/src/Test.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2012 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. - */ - -/** - * This class and method will be overwritten by smali to return non-null. - */ -public class Test { - public static Object run() { - return null; - } -} -- cgit v1.2.3-59-g8ed1b