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

am 5507deda: Merge "Make gtest_main exit 1 when some test are failed."

Browse Source 
* commit '5507dedaeb43e01edfab4b0e2cc290622b20e678':
  Make gtest_main exit 1 when some test are failed.
This commit is contained in:
Yabin Cui 2015-03-13 17:09:14 +00:00 committed by Android Git Automerger
commit 1e795957f4
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/gtest_main.cpp
View File

@ -741,7 +741,8 @@ static void CollectChildTestResult(const ChildProcInfo& child_proc, TestCase& te
// We choose to use multi-fork and multi-wait here instead of multi-thread, because it always // We choose to use multi-fork and multi-wait here instead of multi-thread, because it always
// makes deadlock to use fork in multi-thread. // makes deadlock to use fork in multi-thread.
static void RunTestInSeparateProc(int argc, char** argv, std::vector<TestCase>& testcase_list, // Returns true if all tests run successfully, otherwise return false.
static bool RunTestInSeparateProc(int argc, char** argv, std::vector<TestCase>& testcase_list,
size_t iteration_count, size_t job_count, size_t iteration_count, size_t job_count,
const std::string& xml_output_filename) { const std::string& xml_output_filename) {
// Stop default result printer to avoid environment setup/teardown information for each test. // Stop default result printer to avoid environment setup/teardown information for each test.
@ -759,6 +760,8 @@ static void RunTestInSeparateProc(int argc, char** argv, std::vector<TestCase>&
exit(1); exit(1);
} }
bool all_tests_passed = true;
for (size_t iteration = 1; iteration <= iteration_count; ++iteration) { for (size_t iteration = 1; iteration <= iteration_count; ++iteration) {
OnTestIterationStartPrint(testcase_list, iteration, iteration_count); OnTestIterationStartPrint(testcase_list, iteration, iteration_count);
int64_t iteration_start_time_ns = NanoTime(); int64_t iteration_start_time_ns = NanoTime();
@ -806,6 +809,9 @@ static void RunTestInSeparateProc(int argc, char** argv, std::vector<TestCase>&
if (++finished_test_count_list[testcase_id] == testcase.TestCount()) { if (++finished_test_count_list[testcase_id] == testcase.TestCount()) {
++finished_testcase_count; ++finished_testcase_count;
} }
if (testcase.GetTestResult(test_id) != TEST_SUCCESS) {
all_tests_passed = false;
}
it = child_proc_list.erase(it); it = child_proc_list.erase(it);
} else { } else {
@ -827,6 +833,8 @@ static void RunTestInSeparateProc(int argc, char** argv, std::vector<TestCase>&
perror("sigprocmask SIG_SETMASK"); perror("sigprocmask SIG_SETMASK");
exit(1); exit(1);
} }
return all_tests_passed;
} }
static size_t GetProcessorCount() { static size_t GetProcessorCount() {
@ -1061,15 +1069,15 @@ int main(int argc, char** argv) {
if (EnumerateTests(argc, arg_list.data(), testcase_list) == false) { if (EnumerateTests(argc, arg_list.data(), testcase_list) == false) {
return 1; return 1;
} }
RunTestInSeparateProc(argc, arg_list.data(), testcase_list, options.gtest_repeat, bool all_test_passed = RunTestInSeparateProc(argc, arg_list.data(), testcase_list,
options.job_count, options.gtest_output); options.gtest_repeat, options.job_count, options.gtest_output);
return all_test_passed ? 0 : 1;
} else { } else {
argc = static_cast<int>(arg_list.size()); argc = static_cast<int>(arg_list.size());
arg_list.push_back(NULL); arg_list.push_back(NULL);
testing::InitGoogleTest(&argc, arg_list.data()); testing::InitGoogleTest(&argc, arg_list.data());
return RUN_ALL_TESTS(); return RUN_ALL_TESTS();
} }
return 0;
} }
//################################################################################ //################################################################################