From b99b922ede28bcf3ef062b9d8c0b40c3c5c5083a Mon Sep 17 00:00:00 2001 From: michael-grunder Date: Tue, 25 Jun 2024 20:37:30 -0700 Subject: [PATCH] Use correct test binary name --- .github/workflows/build.yml | 6 +++--- tests/CMakeLists.txt | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ca0ffa0..ec32bd7c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -174,7 +174,7 @@ jobs: choco install -y ninja memurai-developer - uses: ilammy/msvc-dev-cmd@v1 - - name: Build hiredis + - name: Build libvalkey run: | mkdir build && cd build cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_EXAMPLES=ON @@ -182,7 +182,7 @@ jobs: - name: Run tests run: | - ./build/test.exe + ./build/client_test.exe - name: Install Cygwin Action uses: cygwin/cygwin-install-action@v2 @@ -191,6 +191,6 @@ jobs: - name: Build in cygwin env: - HIREDIS_PATH: ${{ github.workspace }} + LIBVALKEY_PATH: ${{ github.workspace }} run: | make clean && make diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4fdd328a..676d2497 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -68,11 +68,9 @@ if(SSL_LIBRARY) endif() if(LIBEVENT_LIBRARY) target_compile_definitions(client_test PUBLIC VALKEY_TEST_ASYNC=1) -endif() -target_link_libraries(client_test valkey ${SSL_LIBRARY}) -if(LIBEVENT_LIBRARY) target_link_libraries(client_test ${LIBEVENT_LIBRARY}) endif() +target_link_libraries(client_test valkey ${SSL_LIBRARY}) add_test(NAME client_test COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/test.sh") if(TEST_WITH_REDIS_VERSION) set_property(TEST client_test PROPERTY ENVIRONMENT "VALKEY_SERVER=redis-server")