Force cts to only run one test at a time.
Also, slightly increase the timeout for each test run.
Bug: 24198050
Change-Id: I2b0ebdebb909023d0f179e0a433c564266a99161
diff --git a/tests/Android.mk b/tests/Android.mk
index e964a03..6de89c5 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -253,7 +253,12 @@
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