From c7aa0b9a201af2041e9e67789661a4773991736e Mon Sep 17 00:00:00 2001
From: Hongli Lai <hongli@phusion.nl>
Date: Wed, 18 Sep 2024 16:21:28 +0200
Subject: [PATCH] test

---
 .github/workflows/main.yml | 4 ++--
 build/cxx_tests.rb         | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bd58f23377..e69a66af6e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -58,10 +58,10 @@ jobs:
         run: cp test/config.json.github-ci-macos test/config.json
 
       - name: Build C++ tests
-        run: bundle exec drake -j4 buildout/cxx/main buildout/support-binaries/PassengerAgent
+        run: bundle exec drake -j4 test:cxx:build
 
       - name: Run C++ tests
-        run: bundle exec drake -j4 test:cxx
+        run: bundle exec drake test:cxx
         env:
           SUDO: '1'
           SCCACHE_AZURE_CONNECTION_STRING: ${{ secrets.AZURE_CI_STORAGE_CONNECTION_STRING }}
diff --git a/build/cxx_tests.rb b/build/cxx_tests.rb
index e3a81be0b2..03c444aba9 100644
--- a/build/cxx_tests.rb
+++ b/build/cxx_tests.rb
@@ -204,14 +204,16 @@
   )
 end
 
-dependencies = [
+cxx_test_dependencies = [
   TEST_CXX_TARGET,
   "#{TEST_OUTPUT_DIR}allocate_memory",
   NATIVE_SUPPORT_TARGET,
   AGENT_TARGET
 ].compact
+task 'test:cxx:build' => cxx_test_dependencies
+
 desc "Run unit tests for the C++ components"
-task 'test:cxx' => dependencies do
+task 'test:cxx' => cxx_test_dependencies do
   args = ENV['GROUPS'].to_s.split(";").map{ |name| "-g #{name}" }
 
   if level = string_option('LOG_LEVEL')