From 6c73e82fbbe6b552c8941c5c0c939506a05f7bc2 Mon Sep 17 00:00:00 2001
From: yhirose <yuji.hirose.bug@gmail.com>
Date: Mon, 12 Jan 2026 22:28:58 -0500
Subject: [PATCH] Fix problems on CI

---
 .github/workflows/test.yaml | 6 +++---
 test/Makefile               | 8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index eebd355..dc8463c 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -121,13 +121,13 @@ jobs:
         run: brew install mbedtls
       - name: build and run tests (OpenSSL)
         if: matrix.tls_backend == 'openssl'
-        run: cd test && make PREFIX=$(brew --prefix)
+        run: cd test && make
       - name: build and run tests (Mbed TLS)
         if: matrix.tls_backend == 'mbedtls'
-        run: cd test && make test_mbedtls PREFIX=$(brew --prefix) && ./test_mbedtls
+        run: cd test && make test_mbedtls && ./test_mbedtls
       - name: run fuzz test target
         if: matrix.tls_backend == 'openssl'
-        run: cd test && make fuzz_test PREFIX=$(brew --prefix)
+        run: cd test && make fuzz_test
 
   windows:
     runs-on: windows-latest
diff --git a/test/Makefile b/test/Makefile
index ae6fd46..4760f43 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -4,16 +4,14 @@ CXXFLAGS = -g -std=c++11 -I. -Wall -Wextra -Wtype-limits -Wconversion -Wshadow $
 ifneq ($(OS), Windows_NT)
 	UNAME_S := $(shell uname -s)
 	ifeq ($(UNAME_S), Darwin)
-		# macOS: use Homebrew paths
 		PREFIX ?= $(shell brew --prefix)
 		OPENSSL_DIR = $(PREFIX)/opt/openssl@3
 		OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I$(OPENSSL_DIR)/include -L$(OPENSSL_DIR)/lib -lssl -lcrypto
 		OPENSSL_SUPPORT += -DCPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN -framework Security
-		MBEDTLS_DIR = $(PREFIX)/opt/mbedtls
+		MBEDTLS_DIR ?= $(shell brew --prefix mbedtls)
 		MBEDTLS_SUPPORT = -DCPPHTTPLIB_MBEDTLS_SUPPORT -I$(MBEDTLS_DIR)/include -L$(MBEDTLS_DIR)/lib -lmbedtls -lmbedx509 -lmbedcrypto
 		MBEDTLS_SUPPORT += -DCPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN -framework Security
 	else
-		# Linux: use system paths
 		OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -lssl -lcrypto
 		MBEDTLS_SUPPORT = -DCPPHTTPLIB_MBEDTLS_SUPPORT -lmbedtls -lmbedx509 -lmbedcrypto
 	endif
@@ -105,8 +103,8 @@ test_split : test.cc ../httplib.h httplib.cc Makefile cert.pem
 	$(CXX) -o $@ $(CXXFLAGS) test.cc httplib.cc $(TEST_ARGS)
 
 # Mbed TLS backend targets
-test_mbedtls : test.cc include_httplib.cc ../httplib.h Makefile cert.pem
-	$(CXX) -o $@ -I.. $(CXXFLAGS) test.cc include_httplib.cc $(TEST_ARGS_MBEDTLS)
+test_mbedtls : test.cc include_httplib.cc gtest/src/gtest-all.cc gtest/src/gtest_main.cc
+	$(CXX) -o $@ $(CXXFLAGS) test.cc include_httplib.cc $(TEST_ARGS_MBEDTLS)
 	@file $@
 
 test_split_mbedtls : test.cc ../httplib.h httplib.cc Makefile cert.pem