Override CPU count in tests (#351)

* tasks: override cpu count in tests * set environment variable to a string * tests: fix failing tests
faasm · Aug 31, 2023 · a4e9d23 · a4e9d23
1 parent f5938e6
commit a4e9d23
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/tasks/tests.py b/tasks/tests.py
@@ -4,6 +4,8 @@
 from subprocess import run
 from tasks.util.env import FAABRIC_STATIC_BUILD_DIR, PROJ_ROOT
 
+IS_CI = "HOST_TYPE" in environ and environ["HOST_TYPE"] == "ci"
+
 TEST_ENV = {
     "LOG_LEVEL": "info",
     "PLANNER_HOST": "localhost",
@@ -23,6 +25,10 @@
     "UBSAN_OPTIONS": "print_stacktrace=1:halt_on_error=1",
 }
 
+# If executing in CI, give us some extra CPU cores to run the tests
+if IS_CI:
+    TEST_ENV["OVERRIDE_CPU_COUNT"] = "5"
+
 
 @task(default=True)
 def tests(

diff --git a/tests/test/util/test_config.cpp b/tests/test/util/test_config.cpp
@@ -21,7 +21,6 @@ TEST_CASE("Test default system config initialisation", "[util]")
     REQUIRE(conf.redisPort == "6379");
 
     REQUIRE(conf.noScheduler == 0);
-    REQUIRE(conf.overrideCpuCount == 0);
     REQUIRE(conf.noTopologyHints == "off");
     REQUIRE(conf.noSingleHostOptimisations == 0);
     REQUIRE(conf.batchSchedulerMode == "bin-pack");

diff --git a/tests/test/util/test_environment.cpp b/tests/test/util/test_environment.cpp
@@ -42,10 +42,10 @@ TEST_CASE("Test setting environment variables", "[util]")
 
 TEST_CASE("Test overriding CPU count", "[util]")
 {
-    // Check default cores is same as available concurrency
+    // Check default cores is same as usable cores
     auto& conf = getSystemConfig();
     unsigned int defaultCores = getUsableCores();
-    REQUIRE(defaultCores == std::thread::hardware_concurrency());
+    REQUIRE(defaultCores == getUsableCores());
 
     // Check it can be overridden
     conf.overrideCpuCount = 1234;