generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 09ee78ae: am b220c4b6: Merge "Make bionic gtest main be compatible with gtest output format for cts test."

Browse Source 
* commit '09ee78ae010a1aa91ed5c12f8da80829837df944':
  Make bionic gtest main be compatible with gtest output format for cts test.
This commit is contained in:
Yabin Cui
2015-02-27 18:42:52 +00:00
committed by Android Git Automerger
parent 21ddfa23f6 09ee78ae01
commit 0d282fc572
2 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/Android.mk
View File

@@ -211,7 +211,7 @@ build_type := host
include $(LOCAL_PATH)/Android.build.mk include $(LOCAL_PATH)/Android.build.mk
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Library of bionic customized gtest main function. # Library of bionic customized gtest main function, with simplified output format.
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
libBionicGtestMain_src_files := gtest_main.cpp libBionicGtestMain_src_files := gtest_main.cpp
@@ -227,6 +227,24 @@ include $(LOCAL_PATH)/Android.build.mk
build_type := host build_type := host
include $(LOCAL_PATH)/Android.build.mk include $(LOCAL_PATH)/Android.build.mk
# -----------------------------------------------------------------------------
# Library of bionic customized gtest main function, with normal gtest output format,
# which is needed by bionic cts test.
# -----------------------------------------------------------------------------
libBionicCtsGtestMain_src_files := gtest_main.cpp
libBionicCtsGtestMain_cflags := $(test_cflags)
libBionicCtsGtestMain_cppflags := $(test_cppflags) -DUSING_GTEST_OUTPUT_FORMAT
module := libBionicCtsGtestMain
module_tag := optional
build_type := target
build_target := STATIC_TEST_LIBRARY
include $(LOCAL_PATH)/Android.build.mk
build_type := host
include $(LOCAL_PATH)/Android.build.mk
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Tests for the device using bionic's .so. Run with: # Tests for the device using bionic's .so. Run with:
# adb shell /data/nativetest/bionic-unit-tests/bionic-unit-tests32 # adb shell /data/nativetest/bionic-unit-tests/bionic-unit-tests32

33
tests/gtest_main.cpp
View File

@@ -295,6 +295,32 @@ static void OnTestIterationStartPrint(const std::vector<TestCase>& testcase_list
fflush(stdout); fflush(stdout);
} }
// bionic cts test needs gtest output format.
#if defined(USING_GTEST_OUTPUT_FORMAT)
static void OnTestEndPrint(const TestCase& testcase, size_t test_id) {
ColoredPrintf(COLOR_GREEN, "[ RUN ] ");
printf("%s\n", testcase.GetTestName(test_id).c_str());
const std::string& test_output = testcase.GetTest(test_id).GetTestOutput();
printf("%s", test_output.c_str());
TestResult result = testcase.GetTestResult(test_id);
if (result == TEST_SUCCESS) {
ColoredPrintf(COLOR_GREEN, "[ OK ] ");
} else {
ColoredPrintf(COLOR_RED, "[ FAILED ] ");
}
printf("%s", testcase.GetTestName(test_id).c_str());
if (testing::GTEST_FLAG(print_time)) {
printf(" (%" PRId64 " ms)", testcase.GetTestTime(test_id) / 1000000);
}
printf("\n");
fflush(stdout);
}
#else // !defined(USING_GTEST_OUTPUT_FORMAT)
static void OnTestEndPrint(const TestCase& testcase, size_t test_id) { static void OnTestEndPrint(const TestCase& testcase, size_t test_id) {
TestResult result = testcase.GetTestResult(test_id); TestResult result = testcase.GetTestResult(test_id);
if (result == TEST_SUCCESS) { if (result == TEST_SUCCESS) {
@@ -307,16 +333,17 @@ static void OnTestEndPrint(const TestCase& testcase, size_t test_id) {
printf("%s", testcase.GetTestName(test_id).c_str()); printf("%s", testcase.GetTestName(test_id).c_str());
if (testing::GTEST_FLAG(print_time)) { if (testing::GTEST_FLAG(print_time)) {
printf(" (%" PRId64 " ms)\n", testcase.GetTestTime(test_id) / 1000000); printf(" (%" PRId64 " ms)", testcase.GetTestTime(test_id) / 1000000);
} else {
printf("\n");
} }
printf("\n");
const std::string& test_output = testcase.GetTest(test_id).GetTestOutput(); const std::string& test_output = testcase.GetTest(test_id).GetTestOutput();
printf("%s", test_output.c_str()); printf("%s", test_output.c_str());
fflush(stdout); fflush(stdout);
} }
#endif // !defined(USING_GTEST_OUTPUT_FORMAT)
static void OnTestIterationEndPrint(const std::vector<TestCase>& testcase_list, size_t /*iteration*/, static void OnTestIterationEndPrint(const std::vector<TestCase>& testcase_list, size_t /*iteration*/,
int64_t elapsed_time_ns) { int64_t elapsed_time_ns) {