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

Remove the workaround which fixes JOB_COUNT in CTS test.

Browse Source 
Bug: 24376925
Change-Id: Ib195ce1577ee9412068cc1b6223fc051b5bcfcaa
This commit is contained in:
Yabin Cui
2015-10-06 16:30:14 -07:00
parent 98be6be171
commit bc6379d7da
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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"
" --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) {