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

gtest_repeat should allow negative values.

Browse Source 
If you pass in a negative value to gtest_repeat, it should run forever.
The new runner didn't allow this, now it does.

Change-Id: Ie0002c12e2fdad22b264adca37c165cfcfe05c7a
This commit is contained in:
Christopher Ferris 2015-04-02 12:02:55 -07:00
parent 52a0f01421
commit 119cb55d43
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/gtest_main.cpp
View File

@ -277,8 +277,8 @@ static bool EnumerateTests(int argc, char** argv, std::vector<TestCase>& testcas
// PrettyUnitTestResultPrinter. The reason for copy is that PrettyUnitTestResultPrinter // PrettyUnitTestResultPrinter. The reason for copy is that PrettyUnitTestResultPrinter
// is defined and used in gtest.cc, which is hard to reuse. // is defined and used in gtest.cc, which is hard to reuse.
static void OnTestIterationStartPrint(const std::vector<TestCase>& testcase_list, size_t iteration, static void OnTestIterationStartPrint(const std::vector<TestCase>& testcase_list, size_t iteration,
size_t iteration_count) { int iteration_count) {
if (iteration_count > 1) { if (iteration_count != 1) {
printf("\nRepeating all tests (iteration %zu) . . .\n\n", iteration); printf("\nRepeating all tests (iteration %zu) . . .\n\n", iteration);
} }
ColoredPrintf(COLOR_GREEN, "[==========] "); ColoredPrintf(COLOR_GREEN, "[==========] ");
@ -743,7 +743,7 @@ static void CollectChildTestResult(const ChildProcInfo& child_proc, TestCase& te
// makes deadlock to use fork in multi-thread. // makes deadlock to use fork in multi-thread.
// Returns true if all tests run successfully, otherwise return false. // Returns true if all tests run successfully, otherwise return false.
static bool RunTestInSeparateProc(int argc, char** argv, std::vector<TestCase>& testcase_list, static bool RunTestInSeparateProc(int argc, char** argv, std::vector<TestCase>& testcase_list,
size_t iteration_count, size_t job_count, int 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.
testing::UnitTest::GetInstance()->listeners().Release( testing::UnitTest::GetInstance()->listeners().Release(
@ -762,7 +762,9 @@ static bool RunTestInSeparateProc(int argc, char** argv, std::vector<TestCase>&
bool all_tests_passed = true; bool all_tests_passed = true;
for (size_t iteration = 1; iteration <= iteration_count; ++iteration) { for (size_t iteration = 1;
iteration_count < 0 || iteration <= static_cast<size_t>(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();
time_t epoch_iteration_start_time = time(NULL); time_t epoch_iteration_start_time = time(NULL);
@ -875,7 +877,7 @@ struct IsolationTestOptions {
int test_warnline_ms; int test_warnline_ms;
std::string gtest_color; std::string gtest_color;
bool gtest_print_time; bool gtest_print_time;
size_t gtest_repeat; int gtest_repeat;
std::string gtest_output; std::string gtest_output;
}; };
@ -993,12 +995,9 @@ static bool PickOptions(std::vector<char*>& args, IsolationTestOptions& options)
} else if (strcmp(args[i], "--gtest_print_time=0") == 0) { } else if (strcmp(args[i], "--gtest_print_time=0") == 0) {
options.gtest_print_time = false; options.gtest_print_time = false;
} else if (strncmp(args[i], "--gtest_repeat=", strlen("--gtest_repeat=")) == 0) { } else if (strncmp(args[i], "--gtest_repeat=", strlen("--gtest_repeat=")) == 0) {
int repeat = atoi(args[i] + strlen("--gtest_repeat=")); // If the value of gtest_repeat is < 0, then it indicates the tests
if (repeat < 0) { // should be repeated forever.
fprintf(stderr, "invalid gtest_repeat count: %d\n", repeat); options.gtest_repeat = atoi(args[i] + strlen("--gtest_repeat="));
return false;
}
options.gtest_repeat = repeat;
// Remove --gtest_repeat=xx from arguments, so child process only run one iteration for a single test. // Remove --gtest_repeat=xx from arguments, so child process only run one iteration for a single test.
args.erase(args.begin() + i); args.erase(args.begin() + i);
--i; --i;