Merge "Use new defines in test code." (a2d1469c) · Commits · e / os / android_system_core

libbacktrace/Android.mk

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -137,6 +137,7 @@ LOCAL_SRC_FILES := \
	thread_utils.c \		thread_utils.c \

	LOCAL_CFLAGS += \		LOCAL_CFLAGS += \
			$(common_cflags) \
	-fno-builtin \		-fno-builtin \
	-fstack-protector-all \		-fstack-protector-all \
	-O0 \		-O0 \
	@@ -149,7 +150,6 @@ LOCAL_CONLYFLAGS += \

	LOCAL_CPPFLAGS += \		LOCAL_CPPFLAGS += \
	$(common_cppflags) \		$(common_cppflags) \
	-fpermissive \

	LOCAL_SHARED_LIBRARIES += \		LOCAL_SHARED_LIBRARIES += \
	libcutils \		libcutils \
	@@ -241,6 +241,7 @@ LOCAL_SRC_FILES := \
	thread_utils.c \		thread_utils.c \

	LOCAL_CFLAGS += \		LOCAL_CFLAGS += \
			$(common_cflags) \
	-fno-builtin \		-fno-builtin \
	-fstack-protector-all \		-fstack-protector-all \
	-O0 \		-O0 \
	@@ -251,9 +252,6 @@ LOCAL_SHARED_LIBRARIES := \
	libbacktrace_test \		libbacktrace_test \
	libbacktrace \		libbacktrace \

	LOCAL_CPPFLAGS += \
	-fpermissive \

	LOCAL_LDLIBS := \		LOCAL_LDLIBS := \
	-lpthread \		-lpthread \

libbacktrace/backtrace_test.cpp

+13 −13

Original line number	Original line	Diff line number	Diff line
	@@ -143,7 +143,7 @@ void VerifyLevelDump(const backtrace_t* backtrace) {
	void VerifyLevelBacktrace(void*) {		void VerifyLevelBacktrace(void*) {
	backtrace_context_t context;		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);		VerifyLevelDump(context.backtrace);

	@@ -165,7 +165,7 @@ void VerifyMaxDump(const backtrace_t* backtrace) {
	void VerifyMaxBacktrace(void*) {		void VerifyMaxBacktrace(void*) {
	backtrace_context_t context;		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);		VerifyMaxDump(context.backtrace);

	@@ -232,15 +232,15 @@ void VerifyIgnoreFrames(

	void VerifyLevelIgnoreFrames(void*) {		void VerifyLevelIgnoreFrames(void*) {
	backtrace_context_t all;		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);		ASSERT_TRUE(all.backtrace != NULL);

	backtrace_context_t ign1;		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);		ASSERT_TRUE(ign1.backtrace != NULL);

	backtrace_context_t ign2;		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);		ASSERT_TRUE(ign2.backtrace != NULL);

	VerifyIgnoreFrames(all.backtrace, ign1.backtrace, ign2.backtrace,		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);		ASSERT_NE(test_level_one(1, 2, 3, 4, NULL, NULL), 0);
	exit(1);		exit(1);
	}		}
	VerifyProcTest(pid, -1, ReadyLevelBacktrace, VerifyLevelDump);		VerifyProcTest(pid, BACKTRACE_NO_TID, ReadyLevelBacktrace, VerifyLevelDump);

	kill(pid, SIGKILL);		kill(pid, SIGKILL);
	int status;		int status;
	@@ -309,7 +309,7 @@ TEST(libbacktrace, ptrace_max_trace) {
	ASSERT_NE(test_recursive_call(MAX_BACKTRACE_FRAMES+10, NULL, NULL), 0);		ASSERT_NE(test_recursive_call(MAX_BACKTRACE_FRAMES+10, NULL, NULL), 0);
	exit(1);		exit(1);
	}		}
	VerifyProcTest(pid, -1, ReadyMaxBacktrace, VerifyMaxDump);		VerifyProcTest(pid, BACKTRACE_NO_TID, ReadyMaxBacktrace, VerifyMaxDump);

	kill(pid, SIGKILL);		kill(pid, SIGKILL);
	int status;		int status;
	@@ -320,11 +320,11 @@ void VerifyProcessIgnoreFrames(const backtrace_t* bt_all) {
	pid_t pid = bt_all->pid;		pid_t pid = bt_all->pid;

	backtrace_context_t ign1;		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);		ASSERT_TRUE(ign1.backtrace != NULL);

	backtrace_context_t ign2;		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);		ASSERT_TRUE(ign2.backtrace != NULL);

	VerifyIgnoreFrames(bt_all, ign1.backtrace, 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);		ASSERT_NE(test_level_one(1, 2, 3, 4, NULL, NULL), 0);
	exit(1);		exit(1);
	}		}
	VerifyProcTest(pid, -1, ReadyLevelBacktrace, VerifyProcessIgnoreFrames);		VerifyProcTest(pid, BACKTRACE_NO_TID, ReadyLevelBacktrace, VerifyProcessIgnoreFrames);

	kill(pid, SIGKILL);		kill(pid, SIGKILL);
	int status;		int status;
	@@ -614,10 +614,10 @@ TEST(libbacktrace, thread_multiple_dump) {
	TEST(libbacktrace, format_test) {		TEST(libbacktrace, format_test) {
	backtrace_context_t context;		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);		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;		backtrace_frame_data_t save_frame = *frame;

	memset(frame, 0, sizeof(backtrace_frame_data_t));		memset(frame, 0, sizeof(backtrace_frame_data_t));
	@@ -638,7 +638,7 @@ TEST(libbacktrace, format_test) {
	EXPECT_STREQ(buf, "#01 pc 12345678 MapFake");		EXPECT_STREQ(buf, "#01 pc 12345678 MapFake");
	#endif		#endif

	frame->func_name = "ProcFake";		frame->func_name = const_cast<char*>("ProcFake");
	backtrace_format_frame_data(&context, 1, buf, sizeof(buf));		backtrace_format_frame_data(&context, 1, buf, sizeof(buf));
	#if defined(__LP64__)		#if defined(__LP64__)
	EXPECT_STREQ(buf, "#01 pc 0000000012345678 MapFake (ProcFake)");		EXPECT_STREQ(buf, "#01 pc 0000000012345678 MapFake (ProcFake)");