From 1a750a42d1b784f68f936bff8334c90a4a87ac9f Mon Sep 17 00:00:00 2001
From: jzmaddock <john@johnmaddock.co.uk>
Date: Sat, 10 Dec 2022 11:44:19 +0000
Subject: [PATCH] Correct CI script, correct ICU testing config.

---
 .github/workflows/ci.yml  | 2 +-
 test/regress/test_icu.cpp | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1976a8d2..fd279175 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -88,7 +88,7 @@ jobs:
         run: sudo apt install g++-9 g++-10
       - name: Test
         run: ${{ matrix.compiler }} -std=${{ matrix.standard }}  -I../../include *.cpp ../../src/*.cpp -o regress -licuuc -licudata -licu18n && ./regress
-        working-directory: $GITHUB_WORKSPACE/test/regress
+        working-directory: ./test/regress
   ubuntu-bionic:
     runs-on: ubuntu-18.04
     strategy:
diff --git a/test/regress/test_icu.cpp b/test/regress/test_icu.cpp
index 5dbc1cb6..c0d7f569 100644
--- a/test/regress/test_icu.cpp
+++ b/test/regress/test_icu.cpp
@@ -21,11 +21,13 @@
 //
 #include <boost/regex/config.hpp>
 
+#ifdef BOOST_REGEX_STANDALONE
 #ifdef __has_include
-#if __has_include(<unicode/utypes.h>)
+#if __has_include(<unicode/utypes.h>) && __has_include(<unicode/uchar.h>) && __has_include(<unicode/coll.h>)
 #define BOOST_HAS_ICU
 #endif
 #endif
+#endif
 
 #if defined(BOOST_HAS_ICU) && !defined(BOOST_NO_STD_WSTRING)