summaryrefslogtreecommitdiffstats
path: root/runtime/thread.cc
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-02-17 19:25:29 -0800
committerAndreas Gampe <agampe@google.com>2015-02-17 19:25:29 -0800
commite4301ffb56f9be6f6c2640bfb1870b74f4a37ad2 (patch)
treeb21393462212ed0cf6a19e6a4454db9548ab48a2 /runtime/thread.cc
parent17609db47537ea6da03db1be530ad13e67cf24db (diff)
downloadandroid_art-e4301ffb56f9be6f6c2640bfb1870b74f4a37ad2.tar.gz
android_art-e4301ffb56f9be6f6c2640bfb1870b74f4a37ad2.tar.bz2
android_art-e4301ffb56f9be6f6c2640bfb1870b74f4a37ad2.zip
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/thread.cc')
-rw-r--r--runtime/thread.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/thread.cc b/runtime/thread.cc
index 16edab397f..cb6ed64f60 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());
}
}