Merge branch 'override-cpu-tests' into call-batch

faasm · Aug 30, 2023 · a196a01 · a196a01
2 parents 1466107 + 560e5a2
commit a196a01
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
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;