diff options
author | Andreas Gampe <agampe@google.com> | 2015-02-17 19:25:29 -0800 |
---|---|---|
committer | Andreas Gampe <agampe@google.com> | 2015-02-17 19:25:29 -0800 |
commit | e4301ffb56f9be6f6c2640bfb1870b74f4a37ad2 (patch) | |
tree | b21393462212ed0cf6a19e6a4454db9548ab48a2 /runtime | |
parent | 17609db47537ea6da03db1be530ad13e67cf24db (diff) | |
download | art-e4301ffb56f9be6f6c2640bfb1870b74f4a37ad2.zip art-e4301ffb56f9be6f6c2640bfb1870b74f4a37ad2.tar.gz art-e4301ffb56f9be6f6c2640bfb1870b74f4a37ad2.tar.bz2 |
ART: Make run-tests more verbose
Make run-tests log ERROR level on host. Adjust some internal LOG(ERROR)
to LOG(WARNING). Add check scripts to adjust for other LOG(ERROR)
messages.
Bug: 18713034
Change-Id: I2a3e055baa6a0e31f106364c300c20963a59ed94
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/class_linker.cc | 4 | ||||
-rw-r--r-- | runtime/native/java_lang_Runtime.cc | 2 | ||||
-rw-r--r-- | runtime/thread.cc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 3592d2c..8609807 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -3511,7 +3511,7 @@ void ClassLinker::VerifyClass(Thread* self, Handle<mirror::Class> klass) { StringPrintf("Rejecting class %s that attempts to sub-class erroneous class %s", PrettyDescriptor(klass.Get()).c_str(), PrettyDescriptor(super.Get()).c_str())); - LOG(ERROR) << error_msg << " in " << klass->GetDexCache()->GetLocation()->ToModifiedUtf8(); + LOG(WARNING) << error_msg << " in " << klass->GetDexCache()->GetLocation()->ToModifiedUtf8(); Handle<mirror::Throwable> cause(hs.NewHandle(self->GetException(nullptr))); if (cause.Get() != nullptr) { self->ClearException(); @@ -3584,7 +3584,7 @@ void ClassLinker::VerifyClass(Thread* self, Handle<mirror::Class> klass) { } } } else { - LOG(ERROR) << "Verification failed on class " << PrettyDescriptor(klass.Get()) + LOG(WARNING) << "Verification failed on class " << PrettyDescriptor(klass.Get()) << " in " << klass->GetDexCache()->GetLocation()->ToModifiedUtf8() << " because: " << error_msg; self->AssertNoPendingException(); diff --git a/runtime/native/java_lang_Runtime.cc b/runtime/native/java_lang_Runtime.cc index dc0cb7b..97b17bf 100644 --- a/runtime/native/java_lang_Runtime.cc +++ b/runtime/native/java_lang_Runtime.cc @@ -65,7 +65,7 @@ static jstring Runtime_nativeLoad(JNIEnv* env, jclass, jstring javaFilename, job Fn android_update_LD_LIBRARY_PATH = reinterpret_cast<Fn>(sym); (*android_update_LD_LIBRARY_PATH)(ldLibraryPath.c_str()); } else { - LOG(ERROR) << "android_update_LD_LIBRARY_PATH not found; .so dependencies will not work!"; + LOG(WARNING) << "android_update_LD_LIBRARY_PATH not found; .so dependencies will not work!"; } } diff --git a/runtime/thread.cc b/runtime/thread.cc index 16edab3..cb6ed64 100644 --- a/runtime/thread.cc +++ b/runtime/thread.cc @@ -1854,7 +1854,7 @@ void Thread::ThrowNewWrappedException(const ThrowLocation& throw_location, } void Thread::ThrowOutOfMemoryError(const char* msg) { - LOG(ERROR) << StringPrintf("Throwing OutOfMemoryError \"%s\"%s", + LOG(WARNING) << StringPrintf("Throwing OutOfMemoryError \"%s\"%s", msg, (tls32_.throwing_OutOfMemoryError ? " (recursive case)" : "")); ThrowLocation throw_location = GetCurrentLocationForThrow(); if (!tls32_.throwing_OutOfMemoryError) { @@ -1862,7 +1862,7 @@ void Thread::ThrowOutOfMemoryError(const char* msg) { ThrowNewException(throw_location, "Ljava/lang/OutOfMemoryError;", msg); tls32_.throwing_OutOfMemoryError = false; } else { - Dump(LOG(ERROR)); // The pre-allocated OOME has no stack, so help out and log one. + Dump(LOG(WARNING)); // The pre-allocated OOME has no stack, so help out and log one. SetException(throw_location, Runtime::Current()->GetPreAllocatedOutOfMemoryError()); } } |