diff options
| -rw-r--r-- | src/mutex_test.cc | 18 | ||||
| -rw-r--r-- | test/089-many-methods/build | 49 | ||||
| -rw-r--r-- | test/089-many-methods/expected.txt | 4 | ||||
| -rw-r--r-- | test/089-many-methods/info.txt | 2 |
4 files changed, 65 insertions, 8 deletions
diff --git a/src/mutex_test.cc b/src/mutex_test.cc index 63aa14bd7c..4931551728 100644 --- a/src/mutex_test.cc +++ b/src/mutex_test.cc @@ -42,16 +42,18 @@ TEST(Mutex, LockUnlock) { MutexTester::AssertDepth(mu, 0U); } -TEST(Mutex, TryLockUnlock) { +// GCC doesn't get recursive mutexes, so we have to turn off thread safety analysis. +static void TryLockUnlockTest() NO_THREAD_SAFETY_ANALYSIS { Mutex mu("test mutex"); MutexTester::AssertDepth(mu, 0U); - bool locked = mu.TryLock(); - ASSERT_TRUE(locked); - if (locked) { // Keep GCC happy. - MutexTester::AssertDepth(mu, 1U); - mu.Unlock(); - MutexTester::AssertDepth(mu, 0U); - } + ASSERT_TRUE(mu.TryLock()); + MutexTester::AssertDepth(mu, 1U); + mu.Unlock(); + MutexTester::AssertDepth(mu, 0U); +} + +TEST(Mutex, TryLockUnlock) { + TryLockUnlockTest(); } // GCC doesn't get recursive mutexes, so we have to turn off thread safety analysis. diff --git a/test/089-many-methods/build b/test/089-many-methods/build new file mode 100644 index 0000000000..0bd90c28a2 --- /dev/null +++ b/test/089-many-methods/build @@ -0,0 +1,49 @@ +#!/bin/bash +# +# Copyright (C) 2008 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. + +# Stop if something fails. +set -e + +# Write out files with 65500 total static fields, instance fields, and methods +# to exceed the dex format's limits. +mkdir src +awk ' +BEGIN { + writeFileField("FillerStatic", "static public int staticInt"); + writeFileField("FillerField", "public int fieldInt"); + writeFileMethod("FillerMethod"); +} +function writeFileField(name, type) { + fileName = "src/" name ".java"; + printf("public class %s {\n", name) > fileName; + for (i = 1; i <= 65500; i++) { + printf(" %s%d;\n", type, i) > fileName; + } + printf("}\n") > fileName; +} +function writeFileMethod(name) { + fileName = "src/" name ".java"; + printf("public class %s {\n", name) > fileName; + for (i = 1; i <= 65500; i++) { + printf(" public void meth%d() { }\n", i) > fileName; + } + printf("}\n") > fileName; +}' + +mkdir classes +${JAVAC} -d classes `find src -name '*.java'` +dx -JXmx1024m --dex --no-optimize classes + diff --git a/test/089-many-methods/expected.txt b/test/089-many-methods/expected.txt new file mode 100644 index 0000000000..fc97b3dbdc --- /dev/null +++ b/test/089-many-methods/expected.txt @@ -0,0 +1,4 @@ + +trouble writing output: Too many fields: 131000; max is 65536. By package: +131000 default +build exit status: 2 diff --git a/test/089-many-methods/info.txt b/test/089-many-methods/info.txt new file mode 100644 index 0000000000..4f73bd605b --- /dev/null +++ b/test/089-many-methods/info.txt @@ -0,0 +1,2 @@ +Test that we print a reasonable message when the application exceeds more +than 65536 methods. |