fix core tests

swoole · Apr 25, 2024 · bd28829 · bd28829
1 parent 04c421e
commit bd28829
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,12 +1,12 @@
 PROJECT(libswoole)
+cmake_minimum_required(VERSION 2.8.12)
 
 ENABLE_LANGUAGE(ASM)
 set(SWOOLE_VERSION 6.0.0-dev)
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -g")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-cmake_minimum_required(VERSION 2.8)
 
 file(READ ./config.h SWOOLE_CONFIG_FILE)
 

diff --git a/core-tests/CMakeLists.txt b/core-tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.1)
+cmake_minimum_required(VERSION 2.8.12)
 
 project(core_tests)
 
@@ -10,14 +10,14 @@ file(GLOB_RECURSE SOURCE_FILES FOLLOW_SYMLINKS src/*.cpp deps/llhttp/src/*.c)
 
 add_definitions(-DHAVE_CONFIG_H)
 
-set(core_tests_includes ./include/ ../thirdparty ../thirdparty/hiredis ./deps/llhttp/include)
+set(core_tests_includes ./include/ ../thirdparty ../thirdparty/hiredis ./deps/llhttp/include /usr/local/include)
 set(core_tests_libraries)
 set(core_tests_link_directories /usr/local/lib)
 
-list(APPEND core_tests_libraries pthread)
+list(APPEND core_tests_libraries pthread gtest gtest_main)
 
 # find GTest
-find_package(GTest)
+find_package(GTest REQUIRED)
 if (!${GTEST_FOUND})
     message(FATAL_ERROR "Not found GTest")
 endif()

diff --git a/core-tests/src/os/async.cpp b/core-tests/src/os/async.cpp
@@ -82,6 +82,12 @@ TEST(async, schedule) {
                 ASSERT_GT(SwooleTG.async_threads->get_queue_size(), 100);
                 ASSERT_GT(SwooleTG.async_threads->get_task_num(), 100);
                 break;
+            } else if (count == N - 1) {
+                ASSERT_EQ(SwooleTG.async_threads->get_worker_num(), 4);
+                ASSERT_EQ(SwooleTG.async_threads->get_queue_size(), 1);
+                ASSERT_EQ(SwooleTG.async_threads->get_task_num(), 1);
+            } else if (count < N / 2) {
+                ASSERT_GT(SwooleTG.async_threads->get_worker_num(), 4);
             }
         }
     });