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

Merge "Remove the workaround which fixes JOB_COUNT in CTS test."

Browse Source
This commit is contained in:
Yabin Cui 2015-10-07 17:05:29 +00:00 committed by Gerrit Code Review
commit f96049062f
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/Android.mk
View File

@ -255,11 +255,6 @@ 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 := libBionicCtsGtestMain
module_tag := optional module_tag := optional
build_type := target build_type := target

6
tests/gtest_main.cpp
View File

@ -100,7 +100,7 @@ static void PrintHelpInfo() {
" Don't use isolation mode, run all tests in a single process.\n" " Don't use isolation mode, run all tests in a single process.\n"
" --deadline=[TIME_IN_MS]\n" " --deadline=[TIME_IN_MS]\n"
" Run each test in no longer than [TIME_IN_MS] time.\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" " --warnline=[TIME_IN_MS]\n"
" Test running longer than [TIME_IN_MS] will be warned.\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" " 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() { static size_t GetDefaultJobCount() {
#if defined(JOB_COUNT_FIXED)
return JOB_COUNT_FIXED;
#else
return static_cast<size_t>(sysconf(_SC_NPROCESSORS_ONLN)); return static_cast<size_t>(sysconf(_SC_NPROCESSORS_ONLN));
#endif
} }
static void AddPathSeparatorInTestProgramPath(std::vector<char*>& args) { static void AddPathSeparatorInTestProgramPath(std::vector<char*>& args) {