diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 00:40:50 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 14:38:19 +0000 |
| commit | 6cfec1a5b66fe113ffbe81c125ea700f21b30439 (patch) | |
| tree | a1753b317adea2c440b98cb8854a0ee152f8bcb0 /tests/gtest_main.cpp | |
| parent | e2f0539dee416d6770493a0d90e1bdffa874acf1 (diff) | |
| parent | 7ed993ad49ebcb0c702f000978f42f52e9f423ab (diff) | |
| download | bionic-6cfec1a5b66fe113ffbe81c125ea700f21b30439.zip bionic-6cfec1a5b66fe113ffbe81c125ea700f21b30439.tar.gz bionic-6cfec1a5b66fe113ffbe81c125ea700f21b30439.tar.bz2 | |
Merge tag 'android-6.0.0_r26' into cm-13.0
Android 6.0.0 release 26
Change-Id: Ic73500c2330af39a735307c153fbe3e71b7f2040
Diffstat (limited to 'tests/gtest_main.cpp')
| -rw-r--r-- | tests/gtest_main.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/gtest_main.cpp b/tests/gtest_main.cpp index 692b7e8..5d25a4c 100644 --- a/tests/gtest_main.cpp +++ b/tests/gtest_main.cpp @@ -59,7 +59,7 @@ using testing::internal::COLOR_GREEN; using testing::internal::COLOR_YELLOW; using testing::internal::ColoredPrintf; -constexpr int DEFAULT_GLOBAL_TEST_RUN_DEADLINE_MS = 60000; +constexpr int DEFAULT_GLOBAL_TEST_RUN_DEADLINE_MS = 90000; constexpr int DEFAULT_GLOBAL_TEST_RUN_WARNLINE_MS = 2000; // The time each test can run before killed for the reason of timeout. @@ -839,8 +839,12 @@ static bool RunTestInSeparateProc(int argc, char** argv, std::vector<TestCase>& return all_tests_passed; } -static size_t GetProcessorCount() { +static size_t GetDefaultJobCount() { +#if defined(JOB_COUNT_FIXED) + return JOB_COUNT_FIXED; +#else return static_cast<size_t>(sysconf(_SC_NPROCESSORS_ONLN)); +#endif } static void AddPathSeparatorInTestProgramPath(std::vector<char*>& args) { @@ -950,7 +954,7 @@ static bool PickOptions(std::vector<char*>& args, IsolationTestOptions& options) } // Init default isolation test options. - options.job_count = GetProcessorCount(); + options.job_count = GetDefaultJobCount(); options.test_deadline_ms = DEFAULT_GLOBAL_TEST_RUN_DEADLINE_MS; options.test_warnline_ms = DEFAULT_GLOBAL_TEST_RUN_WARNLINE_MS; options.gtest_color = testing::GTEST_FLAG(color); |