diff options
author | Christopher Ferris <cferris@google.com> | 2013-11-05 20:15:29 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-11-05 20:15:29 +0000 |
commit | a2d1469c773d809261d830d2f3cb3f6a7b6cdade (patch) | |
tree | 7f88d644b304fb175b47b66617a10d783fb4c144 | |
parent | c2945850e58f4ef50f3e3534ce50306262375d37 (diff) | |
parent | 7f081ec079923a089c9928bc982154b873addf68 (diff) | |
download | system_core-a2d1469c773d809261d830d2f3cb3f6a7b6cdade.zip system_core-a2d1469c773d809261d830d2f3cb3f6a7b6cdade.tar.gz system_core-a2d1469c773d809261d830d2f3cb3f6a7b6cdade.tar.bz2 |
Merge "Use new defines in test code."
-rw-r--r-- | libbacktrace/Android.mk | 6 | ||||
-rw-r--r-- | libbacktrace/backtrace_test.cpp | 26 |
2 files changed, 15 insertions, 17 deletions
diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk index 66d7e62..50354d0 100644 --- a/libbacktrace/Android.mk +++ b/libbacktrace/Android.mk @@ -137,6 +137,7 @@ LOCAL_SRC_FILES := \ thread_utils.c \ LOCAL_CFLAGS += \ + $(common_cflags) \ -fno-builtin \ -fstack-protector-all \ -O0 \ @@ -149,7 +150,6 @@ LOCAL_CONLYFLAGS += \ LOCAL_CPPFLAGS += \ $(common_cppflags) \ - -fpermissive \ LOCAL_SHARED_LIBRARIES += \ libcutils \ @@ -241,6 +241,7 @@ LOCAL_SRC_FILES := \ thread_utils.c \ LOCAL_CFLAGS += \ + $(common_cflags) \ -fno-builtin \ -fstack-protector-all \ -O0 \ @@ -251,9 +252,6 @@ LOCAL_SHARED_LIBRARIES := \ libbacktrace_test \ libbacktrace \ -LOCAL_CPPFLAGS += \ - -fpermissive \ - LOCAL_LDLIBS := \ -lpthread \ diff --git a/libbacktrace/backtrace_test.cpp b/libbacktrace/backtrace_test.cpp index 48e2bdc..2603e1f 100644 --- a/libbacktrace/backtrace_test.cpp +++ b/libbacktrace/backtrace_test.cpp @@ -143,7 +143,7 @@ void VerifyLevelDump(const backtrace_t* backtrace) { void VerifyLevelBacktrace(void*) { backtrace_context_t context; - ASSERT_TRUE(backtrace_create_context(&context, -1, -1, 0)); + ASSERT_TRUE(backtrace_create_context(&context, BACKTRACE_CURRENT_PROCESS, BACKTRACE_NO_TID, 0)); VerifyLevelDump(context.backtrace); @@ -165,7 +165,7 @@ void VerifyMaxDump(const backtrace_t* backtrace) { void VerifyMaxBacktrace(void*) { backtrace_context_t context; - ASSERT_TRUE(backtrace_create_context(&context, -1, -1, 0)); + ASSERT_TRUE(backtrace_create_context(&context, BACKTRACE_CURRENT_PROCESS, BACKTRACE_NO_TID, 0)); VerifyMaxDump(context.backtrace); @@ -232,15 +232,15 @@ void VerifyIgnoreFrames( void VerifyLevelIgnoreFrames(void*) { backtrace_context_t all; - ASSERT_TRUE(backtrace_create_context(&all, -1, -1, 0)); + ASSERT_TRUE(backtrace_create_context(&all, BACKTRACE_CURRENT_PROCESS, BACKTRACE_NO_TID, 0)); ASSERT_TRUE(all.backtrace != NULL); backtrace_context_t ign1; - ASSERT_TRUE(backtrace_create_context(&ign1, -1, -1, 1)); + ASSERT_TRUE(backtrace_create_context(&ign1, BACKTRACE_CURRENT_PROCESS, BACKTRACE_NO_TID, 1)); ASSERT_TRUE(ign1.backtrace != NULL); backtrace_context_t ign2; - ASSERT_TRUE(backtrace_create_context(&ign2, -1, -1, 2)); + ASSERT_TRUE(backtrace_create_context(&ign2, BACKTRACE_CURRENT_PROCESS, BACKTRACE_NO_TID, 2)); ASSERT_TRUE(ign2.backtrace != NULL); VerifyIgnoreFrames(all.backtrace, ign1.backtrace, ign2.backtrace, @@ -296,7 +296,7 @@ TEST(libbacktrace, ptrace_trace) { ASSERT_NE(test_level_one(1, 2, 3, 4, NULL, NULL), 0); exit(1); } - VerifyProcTest(pid, -1, ReadyLevelBacktrace, VerifyLevelDump); + VerifyProcTest(pid, BACKTRACE_NO_TID, ReadyLevelBacktrace, VerifyLevelDump); kill(pid, SIGKILL); int status; @@ -309,7 +309,7 @@ TEST(libbacktrace, ptrace_max_trace) { ASSERT_NE(test_recursive_call(MAX_BACKTRACE_FRAMES+10, NULL, NULL), 0); exit(1); } - VerifyProcTest(pid, -1, ReadyMaxBacktrace, VerifyMaxDump); + VerifyProcTest(pid, BACKTRACE_NO_TID, ReadyMaxBacktrace, VerifyMaxDump); kill(pid, SIGKILL); int status; @@ -320,11 +320,11 @@ void VerifyProcessIgnoreFrames(const backtrace_t* bt_all) { pid_t pid = bt_all->pid; backtrace_context_t ign1; - ASSERT_TRUE(backtrace_create_context(&ign1, pid, -1, 1)); + ASSERT_TRUE(backtrace_create_context(&ign1, pid, BACKTRACE_NO_TID, 1)); ASSERT_TRUE(ign1.backtrace != NULL); backtrace_context_t ign2; - ASSERT_TRUE(backtrace_create_context(&ign2, pid, -1, 2)); + ASSERT_TRUE(backtrace_create_context(&ign2, pid, BACKTRACE_NO_TID, 2)); ASSERT_TRUE(ign2.backtrace != NULL); VerifyIgnoreFrames(bt_all, ign1.backtrace, ign2.backtrace, NULL); @@ -339,7 +339,7 @@ TEST(libbacktrace, ptrace_ignore_frames) { ASSERT_NE(test_level_one(1, 2, 3, 4, NULL, NULL), 0); exit(1); } - VerifyProcTest(pid, -1, ReadyLevelBacktrace, VerifyProcessIgnoreFrames); + VerifyProcTest(pid, BACKTRACE_NO_TID, ReadyLevelBacktrace, VerifyProcessIgnoreFrames); kill(pid, SIGKILL); int status; @@ -614,10 +614,10 @@ TEST(libbacktrace, thread_multiple_dump) { TEST(libbacktrace, format_test) { backtrace_context_t context; - ASSERT_TRUE(backtrace_create_context(&context, -1, -1, 0)); + ASSERT_TRUE(backtrace_create_context(&context, BACKTRACE_CURRENT_PROCESS, BACKTRACE_NO_TID, 0)); ASSERT_TRUE(context.backtrace != NULL); - backtrace_frame_data_t* frame = &context.backtrace->frames[1]; + backtrace_frame_data_t* frame = const_cast<backtrace_frame_data_t*>(&context.backtrace->frames[1]); backtrace_frame_data_t save_frame = *frame; memset(frame, 0, sizeof(backtrace_frame_data_t)); @@ -638,7 +638,7 @@ TEST(libbacktrace, format_test) { EXPECT_STREQ(buf, "#01 pc 12345678 MapFake"); #endif - frame->func_name = "ProcFake"; + frame->func_name = const_cast<char*>("ProcFake"); backtrace_format_frame_data(&context, 1, buf, sizeof(buf)); #if defined(__LP64__) EXPECT_STREQ(buf, "#01 pc 0000000012345678 MapFake (ProcFake)"); |