diff options
| author | Christopher Ferris <cferris@google.com> | 2015-09-24 18:45:53 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2015-09-25 15:33:20 -0700 |
| commit | 93a91f0cf4f015762ac1ed57395c4c0de8ba7db3 (patch) | |
| tree | aca0bdeb626e45394191e33b982ea0b06d62fb93 | |
| parent | 829119425bcc2b5fcec8fdf219026a5192c81234 (diff) | |
| download | android_bionic-93a91f0cf4f015762ac1ed57395c4c0de8ba7db3.tar.gz android_bionic-93a91f0cf4f015762ac1ed57395c4c0de8ba7db3.tar.bz2 android_bionic-93a91f0cf4f015762ac1ed57395c4c0de8ba7db3.zip | |
Force cts to only run one test at a time.
Also, slightly increase the timeout for each test run.
Bug: 24198050
(cherry picked from commit daaaed18ce1d2f2da9d2240e974922299d937670)
Change-Id: I29e169e962da803a89abf0a28e071abcafa315b7
| -rw-r--r-- | tests/Android.mk | 7 | ||||
| -rw-r--r-- | tests/gtest_main.cpp | 10 |
2 files changed, 13 insertions, 4 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index cd6066864..dc2e410bd 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -241,7 +241,12 @@ libBionicCtsGtestMain_src_files := gtest_main.cpp libBionicCtsGtestMain_cflags := $(test_cflags) -libBionicCtsGtestMain_cppflags := $(test_cppflags) -DUSING_GTEST_OUTPUT_FORMAT +libBionicCtsGtestMain_cppflags := $(test_cppflags) -DUSING_GTEST_OUTPUT_FORMAT \ + +# Temporarily fix the job count to 1 for CTS since on some devices the +# number of online cores is incorrectly read as the total number of cores +# in the system. When b/24376925 is fixed, this should be removed. +libBionicCtsGtestMain_cppflags += -DJOB_COUNT_FIXED=1 module := libBionicCtsGtestMain module_tag := optional diff --git a/tests/gtest_main.cpp b/tests/gtest_main.cpp index 692b7e883..5d25a4cd9 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); |