commit 4dd9b4d95eec9db5338fb9bf132f9bb8facf6cf4
author Elliott Hughes <enh@google.com> Mon Dec 12 18:29:24 2011 -0800
committer Elliott Hughes <enh@google.com> Tue Dec 13 08:23:08 2011 -0800
tree f9dc6f6e6a55acea3a08f1f568ae6900c1dd7dd1
parent 20a409c99a649a01cb7c65bd1089988445d8cdfd

Clean up verbose logging.

Change-Id: I6b01980e7145c4f8d25a5b50f620903f61a1b427

src/runtime_test.cc

diff --git a/src/runtime_test.cc b/src/runtime_test.cc
index ce03571..213897f 100644
--- a/src/runtime_test.cc
+++ b/src/runtime_test.cc
@@ -58,10 +58,16 @@
   EXPECT_TRUE(test_vfprintf == parsed->hook_vfprintf_);
   EXPECT_TRUE(test_exit == parsed->hook_exit_);
   EXPECT_TRUE(test_abort == parsed->hook_abort_);
-  ASSERT_EQ(3U, parsed->verbose_.size());
-  EXPECT_TRUE(parsed->verbose_.find("gc") != parsed->verbose_.end());
-  EXPECT_TRUE(parsed->verbose_.find("class") != parsed->verbose_.end());
-  EXPECT_TRUE(parsed->verbose_.find("jni") != parsed->verbose_.end());
+  EXPECT_TRUE(VLOG_IS_ON(class_linker));
+  EXPECT_FALSE(VLOG_IS_ON(compiler));
+  EXPECT_FALSE(VLOG_IS_ON(heap));
+  EXPECT_TRUE(VLOG_IS_ON(gc));
+  EXPECT_FALSE(VLOG_IS_ON(jdwp));
+  EXPECT_TRUE(VLOG_IS_ON(jni));
+  EXPECT_FALSE(VLOG_IS_ON(monitor));
+  EXPECT_FALSE(VLOG_IS_ON(startup));
+  EXPECT_FALSE(VLOG_IS_ON(third_party_jni));
+  EXPECT_FALSE(VLOG_IS_ON(threads));
   ASSERT_EQ(2U, parsed->properties_.size());
   EXPECT_EQ("foo=bar", parsed->properties_[0]);
   EXPECT_EQ("baz=qux", parsed->properties_[1]);