Fix macOS test build and LLVM CI detection

Sunrisepeak · Sunrisepeak · commit 8d5ec274a353 · 2026-03-10T16:45:14.000+08:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -92,8 +92,10 @@ jobs:
 
       - name: Configure xmake
         run: |
-          LLVM_SDK="$HOME/.xlings/data/xpkgs/xim-x-llvm/20.1.7"
-          test -n "$LLVM_SDK"
+          LLVM_ROOT="$HOME/.xlings/data/xpkgs/xim-x-llvm"
+          LLVM_SDK=$(find "$LLVM_ROOT" -mindepth 1 -maxdepth 1 -type d | sort -V | tail -1)
+          test -d "$LLVM_SDK"
+          "$LLVM_SDK/bin/clang++" --version
           xmake f -m release --toolchain=llvm --sdk="$LLVM_SDK" -y -vvD
 
       - name: Build with xmake
diff --git a/tests/llmapi/test_anthropic_live.cpp b/tests/llmapi/test_anthropic_live.cpp
@@ -2,13 +2,14 @@ import mcpplibs.llmapi;
 import std;
 
 #include <cassert>
+#include "../test_print.hpp"
 
 using namespace mcpplibs::llmapi;
 
 int main() {
     auto apiKey = std::getenv("ANTHROPIC_API_KEY");
     if (!apiKey) {
-        std::println("ANTHROPIC_API_KEY not set, skipping live test");
+        println("ANTHROPIC_API_KEY not set, skipping live test");
         return 0;
     }
 
@@ -19,26 +20,26 @@ int main() {
 
     // Test 1: basic chat
     auto resp = client.chat("Say exactly: HELLO_TEST_OK");
-    std::println("Response: {}", resp.text());
+    println("Response: ", resp.text());
     assert(!resp.text().empty());
     assert(resp.usage.inputTokens > 0);
 
     // Test 2: system message
     client.clear();
     client.system("Always respond with exactly one word.");
     auto resp2 = client.chat("What color is the sky?");
-    std::println("System test: {}", resp2.text());
+    println("System test: ", resp2.text());
 
     // Test 3: streaming
     client.clear();
     std::string streamed;
     auto resp3 = client.chat_stream("Say exactly: STREAM_OK", [&](std::string_view chunk) {
         streamed += chunk;
-        std::print("{}", chunk);
+        print(chunk);
     });
-    std::println("");
+    println();
     assert(!streamed.empty());
 
-    std::println("test_anthropic_live: ALL PASSED");
+    println("test_anthropic_live: ALL PASSED");
     return 0;
 }
diff --git a/tests/llmapi/test_anthropic_serialize.cpp b/tests/llmapi/test_anthropic_serialize.cpp
@@ -2,6 +2,7 @@ import mcpplibs.llmapi;
 import std;
 
 #include <cassert>
+#include "../test_print.hpp"
 
 using namespace mcpplibs::llmapi;
 
@@ -26,6 +27,6 @@ int main() {
     }));
     assert(client.provider().name() == "anthropic");
 
-    std::println("test_anthropic_serialize: ALL PASSED");
+    println("test_anthropic_serialize: ALL PASSED");
     return 0;
 }
diff --git a/tests/llmapi/test_client.cpp b/tests/llmapi/test_client.cpp
@@ -2,6 +2,7 @@ import mcpplibs.llmapi;
 import std;
 
 #include <cassert>
+#include "../test_print.hpp"
 
 using namespace mcpplibs::llmapi;
 
@@ -95,6 +96,6 @@ int main() {
     assert(client2.conversation().size() == 2);
     std::filesystem::remove("/tmp/test_client_conv.json");
 
-    std::println("test_client: ALL PASSED");
+    println("test_client: ALL PASSED");
     return 0;
 }
diff --git a/tests/llmapi/test_coro.cpp b/tests/llmapi/test_coro.cpp
@@ -2,6 +2,7 @@ import mcpplibs.llmapi;
 import std;
 
 #include <cassert>
+#include "../test_print.hpp"
 
 using namespace mcpplibs::llmapi;
 
@@ -74,6 +75,6 @@ int main() {
     auto asyncResp = mock.chat_async({}, {});
     assert(asyncResp.get().text() == "mock async");
 
-    std::println("test_coro: ALL PASSED");
+    println("test_coro: ALL PASSED");
     return 0;
 }
diff --git a/tests/llmapi/test_embeddings.cpp b/tests/llmapi/test_embeddings.cpp
@@ -2,13 +2,14 @@ import mcpplibs.llmapi;
 import std;
 
 #include <cassert>
+#include "../test_print.hpp"
 
 using namespace mcpplibs::llmapi;
 
 int main() {
     auto apiKey = std::getenv("OPENAI_API_KEY");
     if (!apiKey) {
-        std::println("OPENAI_API_KEY not set, skipping");
+        println("OPENAI_API_KEY not set, skipping");
         return 0;
     }
 
@@ -25,8 +26,8 @@ int main() {
     assert(resp.embeddings.size() == 2);
     assert(!resp.embeddings[0].empty());
     assert(resp.usage.inputTokens > 0);
-    std::println("Embedding dim: {}", resp.embeddings[0].size());
+    println("Embedding dim: ", resp.embeddings[0].size());
 
-    std::println("test_embeddings: ALL PASSED");
+    println("test_embeddings: ALL PASSED");
     return 0;
 }
diff --git a/tests/llmapi/test_llmapi_integration.cpp b/tests/llmapi/test_llmapi_integration.cpp
@@ -2,6 +2,7 @@ import mcpplibs.llmapi;
 import std;
 
 #include <cassert>
+#include "../test_print.hpp"
 
 using namespace mcpplibs::llmapi;
 
@@ -76,6 +77,6 @@ int main() {
     assert(resp.tool_calls().size() == 1);
     assert(resp.tool_calls()[0].name == "search");
 
-    std::println("test_integration: ALL PASSED");
+    println("test_integration: ALL PASSED");
     return 0;
 }
diff --git a/tests/llmapi/test_openai_live.cpp b/tests/llmapi/test_openai_live.cpp
@@ -2,13 +2,14 @@ import mcpplibs.llmapi;
 import std;
 
 #include <cassert>
+#include "../test_print.hpp"
 
 using namespace mcpplibs::llmapi;
 
 int main() {
     auto apiKey = std::getenv("OPENAI_API_KEY");
     if (!apiKey) {
-        std::println("OPENAI_API_KEY not set, skipping live test");
+        println("OPENAI_API_KEY not set, skipping live test");
         return 0;
     }
 
@@ -19,7 +20,7 @@ int main() {
 
     // Test 1: basic chat
     auto resp = client.chat("Say exactly: HELLO_TEST_OK");
-    std::println("Response: {}", resp.text());
+    println("Response: ", resp.text());
     assert(!resp.text().empty());
     assert(resp.usage.totalTokens > 0);
     assert(resp.stopReason == StopReason::EndOfTurn);
@@ -29,16 +30,16 @@ int main() {
     std::string streamed;
     auto resp2 = client.chat_stream("Say exactly: STREAM_OK", [&](std::string_view chunk) {
         streamed += chunk;
-        std::print("{}", chunk);
+        print(chunk);
     });
-    std::println("");
+    println();
     assert(!streamed.empty());
 
     // Test 3: conversation continuity
     auto resp3 = client.chat("What did I just ask you to say?");
     assert(!resp3.text().empty());
     assert(client.conversation().messages.size() == 4); // 2 user + 2 assistant
 
-    std::println("test_openai_live: ALL PASSED");
+    println("test_openai_live: ALL PASSED");
     return 0;
 }
diff --git a/tests/llmapi/test_openai_serialize.cpp b/tests/llmapi/test_openai_serialize.cpp
@@ -3,6 +3,7 @@ import mcpplibs.llmapi.nlohmann.json;
 import std;
 
 #include <cassert>
+#include "../test_print.hpp"
 
 using namespace mcpplibs::llmapi;
 using Json = nlohmann::json;
@@ -33,6 +34,6 @@ int main() {
     // Test 4: provider() access
     assert(client.provider().name() == "openai");
 
-    std::println("test_openai_serialize: ALL PASSED");
+    println("test_openai_serialize: ALL PASSED");
     return 0;
 }
diff --git a/tests/llmapi/test_serialization.cpp b/tests/llmapi/test_serialization.cpp
@@ -2,6 +2,7 @@ import mcpplibs.llmapi;
 import std;
 
 #include <cassert>
+#include "../test_print.hpp"
 
 int main() {
     using namespace mcpplibs::llmapi;
@@ -40,6 +41,6 @@ int main() {
     // Cleanup
     std::filesystem::remove(path);
 
-    std::println("test_serialization: ALL PASSED");
+    println("test_serialization: ALL PASSED");
     return 0;
 }
diff --git a/tests/llmapi/test_structured_output.cpp b/tests/llmapi/test_structured_output.cpp
@@ -3,14 +3,15 @@ import mcpplibs.llmapi.nlohmann.json;
 import std;
 
 #include <cassert>
+#include "../test_print.hpp"
 
 using namespace mcpplibs::llmapi;
 using Json = nlohmann::json;
 
 int main() {
     auto apiKey = std::getenv("OPENAI_API_KEY");
     if (!apiKey) {
-        std::println("OPENAI_API_KEY not set, skipping");
+        println("OPENAI_API_KEY not set, skipping");
         return 0;
     }
 
@@ -30,8 +31,8 @@ int main() {
     auto json = Json::parse(resp.text());
     assert(json.contains("name"));
     assert(json.contains("age"));
-    std::println("JSON output: {}", resp.text());
+    println("JSON output: ", resp.text());
 
-    std::println("test_structured_output: ALL PASSED");
+    println("test_structured_output: ALL PASSED");
     return 0;
 }
diff --git a/tests/llmapi/test_tool_calling.cpp b/tests/llmapi/test_tool_calling.cpp
@@ -3,14 +3,15 @@ import mcpplibs.llmapi.nlohmann.json;
 import std;
 
 #include <cassert>
+#include "../test_print.hpp"
 
 using namespace mcpplibs::llmapi;
 using Json = nlohmann::json;
 
 int main() {
     auto apiKey = std::getenv("OPENAI_API_KEY");
     if (!apiKey) {
-        std::println("OPENAI_API_KEY not set, skipping");
+        println("OPENAI_API_KEY not set, skipping");
         return 0;
     }
 
@@ -34,7 +35,7 @@ int main() {
     if (resp.stopReason == StopReason::ToolUse) {
         auto calls = resp.tool_calls();
         assert(!calls.empty());
-        std::println("Tool called: {} with args: {}", calls[0].name, calls[0].arguments);
+        println("Tool called: ", calls[0].name, " with args: ", calls[0].arguments);
         assert(calls[0].name == "get_temperature");
 
         auto args = Json::parse(calls[0].arguments);
@@ -55,13 +56,12 @@ int main() {
         auto messages = client.conversation().messages;
         auto& provider = client.provider();
         auto finalResp = provider.chat(messages, params);
-        std::println("Final: {}", finalResp.text());
+        println("Final: ", finalResp.text());
         assert(!finalResp.text().empty());
     } else {
-        std::println("Model didn't call tool (non-deterministic), response: {}",
-                     resp.text());
+        println("Model didn't call tool (non-deterministic), response: ", resp.text());
     }
 
-    std::println("test_tool_calling: ALL PASSED");
+    println("test_tool_calling: ALL PASSED");
     return 0;
 }
diff --git a/tests/llmapi/test_types.cpp b/tests/llmapi/test_types.cpp
@@ -2,6 +2,7 @@ import mcpplibs.llmapi;
 import std;
 
 #include <cassert>
+#include "../test_print.hpp"
 
 int main() {
     using namespace mcpplibs::llmapi;
@@ -81,6 +82,6 @@ int main() {
     // Test 10: StopReason enum
     assert(StopReason::EndOfTurn != StopReason::ToolUse);
 
-    std::println("test_types: ALL PASSED");
+    println("test_types: ALL PASSED");
     return 0;
 }
diff --git a/tests/test_print.hpp b/tests/test_print.hpp
@@ -0,0 +1,12 @@
+#pragma once
+
+template <typename... Args>
+inline void print(Args&&... args) {
+    (std::cout << ... << std::forward<Args>(args));
+}
+
+template <typename... Args>
+inline void println(Args&&... args) {
+    print(std::forward<Args>(args)...);
+    std::cout << '\n';
+}
diff --git a/tests/tinyhttps/test_http.cpp b/tests/tinyhttps/test_http.cpp
@@ -2,6 +2,7 @@ import mcpplibs.tinyhttps;
 import std;
 
 #include <cassert>
+#include "../test_print.hpp"
 
 int main() {
     using namespace mcpplibs::tinyhttps;
@@ -45,6 +46,6 @@ int main() {
     assert(resp4.statusCode == 404);
 
     Socket::platform_cleanup();
-    std::println("test_http: ALL PASSED");
+    println("test_http: ALL PASSED");
     return 0;
 }
diff --git a/tests/tinyhttps/test_http_stream.cpp b/tests/tinyhttps/test_http_stream.cpp
@@ -2,6 +2,7 @@ import mcpplibs.tinyhttps;
 import std;
 
 #include <cassert>
+#include "../test_print.hpp"
 
 int main() {
     using namespace mcpplibs::tinyhttps;
@@ -21,12 +22,12 @@ int main() {
         },
         [&lineCount](const SseEvent& event) -> bool {
             lineCount++;
-            std::println("Event {}: {}", lineCount, event.data.substr(0, 50));
+            println("Event ", lineCount, ": ", event.data.substr(0, 50));
             return true;
         }
     );
     assert(resp.statusCode == 200);
-    std::println("Stream/3 completed, received {} events, status {}", lineCount, resp.statusCode);
+    println("Stream/3 completed, received ", lineCount, " events, status ", resp.statusCode);
 
     // Test 2: early stop (return false from callback)
     int stopCount { 0 };
@@ -41,7 +42,7 @@ int main() {
         }
     );
     assert(resp2.statusCode == 200);
-    std::println("Stopped after {} events", stopCount);
+    println("Stopped after ", stopCount, " events");
 
     // Test 3: verify response headers are captured
     auto resp3 = client.send_stream(
@@ -53,9 +54,9 @@ int main() {
     );
     assert(resp3.statusCode == 200);
     assert(!resp3.headers.empty());
-    std::println("Response has {} headers", resp3.headers.size());
+    println("Response has ", resp3.headers.size(), " headers");
 
     Socket::platform_cleanup();
-    std::println("test_http_stream: ALL PASSED");
+    println("test_http_stream: ALL PASSED");
     return 0;
 }
diff --git a/tests/tinyhttps/test_integration.cpp b/tests/tinyhttps/test_integration.cpp
diff --git a/tests/tinyhttps/test_proxy.cpp b/tests/tinyhttps/test_proxy.cpp
diff --git a/tests/tinyhttps/test_socket.cpp b/tests/tinyhttps/test_socket.cpp
diff --git a/tests/tinyhttps/test_sse.cpp b/tests/tinyhttps/test_sse.cpp
diff --git a/tests/tinyhttps/test_tls.cpp b/tests/tinyhttps/test_tls.cpp
