From 2a6f06cb4c80474fe751401adbdf84c4c54414d0 Mon Sep 17 00:00:00 2001 From: Fredrik Roubert Date: Thu, 15 Dec 2022 16:21:52 +0900 Subject: [PATCH] ICU-22193 Make run-with-stubdata work with ubuntu-latest. It remains unknown when and why this changed, but nowadays the required data files are to be found in a subdirectory named "build". --- .github/workflows/icu_ci.yml | 2 +- icu4c/source/test/cintltst/cintltst.c | 5 ++++- icu4c/source/test/intltest/intltest.cpp | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/icu_ci.yml b/.github/workflows/icu_ci.yml index ec43e9e4017..712b1341c91 100644 --- a/.github/workflows/icu_ci.yml +++ b/.github/workflows/icu_ci.yml @@ -309,7 +309,7 @@ jobs: # Run ICU4C tests with stubdata. run-with-stubdata: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/icu4c/source/test/cintltst/cintltst.c b/icu4c/source/test/cintltst/cintltst.c index 86e3b000a8d..7afdb60af5f 100644 --- a/icu4c/source/test/cintltst/cintltst.c +++ b/icu4c/source/test/cintltst/cintltst.c @@ -380,7 +380,10 @@ const char *ctest_dataOutDir() */ #if defined (U_TOPBUILDDIR) { - dataOutDir = U_TOPBUILDDIR "data"U_FILE_SEP_STRING"out"U_FILE_SEP_STRING; + dataOutDir = U_TOPBUILDDIR + "data" U_FILE_SEP_STRING + "out" U_FILE_SEP_STRING + "build" U_FILE_SEP_STRING; } #else diff --git a/icu4c/source/test/intltest/intltest.cpp b/icu4c/source/test/intltest/intltest.cpp index 3686e7fd547..d6ca2bf0c9f 100644 --- a/icu4c/source/test/intltest/intltest.cpp +++ b/icu4c/source/test/intltest/intltest.cpp @@ -441,7 +441,10 @@ void IntlTest::setICU_DATA() { #if defined (U_TOPBUILDDIR) { - static char env_string[] = U_TOPBUILDDIR "data" U_FILE_SEP_STRING "out" U_FILE_SEP_STRING; + static char env_string[] = U_TOPBUILDDIR + "data" U_FILE_SEP_STRING + "out" U_FILE_SEP_STRING + "build" U_FILE_SEP_STRING; u_setDataDirectory(env_string); return; } -- 2.40.0