Remove the workaround which fixes JOB_COUNT in CTS test.

Bug: 24376925
Change-Id: Ib195ce1577ee9412068cc1b6223fc051b5bcfcaa

diff --git a/tests/Android.mk b/tests/Android.mk
index 262be64..e2c4fb4 100644 (file)
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -255,11 +255,6 @@ libBionicCtsGtestMain_cflags := $(test_cflags)
 
 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
 build_type := target

diff --git a/tests/gtest_main.cpp b/tests/gtest_main.cpp
index b79c8aa..3b9f6b9 100644 (file)
--- a/tests/gtest_main.cpp
+++ b/tests/gtest_main.cpp
@@ -100,7 +100,7 @@ static void PrintHelpInfo() {
          "      Don't use isolation mode, run all tests in a single process.\n"
          "  --deadline=[TIME_IN_MS]\n"
          "      Run each test in no longer than [TIME_IN_MS] time.\n"
-         "      It takes effect only in isolation mode. Deafult deadline is 60000 ms.\n"
+         "      It takes effect only in isolation mode. Deafult deadline is 90000 ms.\n"
          "  --warnline=[TIME_IN_MS]\n"
          "      Test running longer than [TIME_IN_MS] will be warned.\n"
          "      It takes effect only in isolation mode. Default warnline is 2000 ms.\n"
@@ -878,11 +878,7 @@ static bool RunTestInSeparateProc(int argc, char** argv, std::vector<TestCase>&
 }
 
 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) {