ICU-22592 Rename source file that should not be directly compiled.

unicode-org · Dec 14, 2023 · e2d1d3e · e2d1d3e
1 parent e112f89
commit e2d1d3e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/icu4c/source/test/cintltst/cintltst.vcxproj b/icu4c/source/test/cintltst/cintltst.vcxproj
@@ -88,9 +88,6 @@
  <ClCompile Include="cmsccoll.c" />
  <ClCompile Include="cturtst.c" />
  <ClCompile Include="encoll.c" />
- <ClCompile Include="usrchdat.c">
- <ExcludedFromBuild>true</ExcludedFromBuild>
- </ClCompile>
  <ClCompile Include="usrchtst.c" />
  <ClCompile Include="chashtst.c" />
  <ClCompile Include="sorttest.c" />
@@ -179,6 +176,7 @@
  <ClInclude Include="cjaptst.h" />
  <ClInclude Include="cturtst.h" />
  <ClInclude Include="encoll.h" />
+ <ClInclude Include="usrchdat.inc" />
  <ClInclude Include="ccapitst.h" />
  <ClInclude Include="nccbtst.h" />
  <ClInclude Include="ncnvfbts.h" />

diff --git a/icu4c/source/test/cintltst/cintltst.vcxproj.filters b/icu4c/source/test/cintltst/cintltst.vcxproj.filters
@@ -105,9 +105,6 @@
  <ClCompile Include="encoll.c">
  <Filter>collation</Filter>
  </ClCompile>
- <ClCompile Include="usrchdat.c">
- <Filter>collation</Filter>
- </ClCompile>
  <ClCompile Include="usrchtst.c">
  <Filter>collation</Filter>
  </ClCompile>
@@ -371,6 +368,9 @@
  <ClInclude Include="encoll.h">
  <Filter>collation</Filter>
  </ClInclude>
+ <ClInclude Include="usrchdat.inc">
+ <Filter>collation</Filter>
+ </ClInclude>
  <ClInclude Include="ccapitst.h">
  <Filter>conversion</Filter>
  </ClInclude>

diff --git a/icu4c/source/test/cintltst/usrchdat.c → icu4c/source/test/cintltst/usrchdat.inc b/icu4c/source/test/cintltst/usrchdat.c → icu4c/source/test/cintltst/usrchdat.inc
diff --git a/icu4c/source/test/cintltst/usrchtst.c b/icu4c/source/test/cintltst/usrchtst.c
@@ -22,7 +22,7 @@
 #include "unicode/ustring.h"
 #include "ccolltst.h"
 #include "cmemory.h"
-#include "usrchdat.c"
+#include "usrchdat.inc"
 #include "unicode/ubrk.h"
 
 static UBool TOCLOSE_ = true;

diff --git a/icu4c/source/test/intltest/srchtest.cpp b/icu4c/source/test/intltest/srchtest.cpp
@@ -12,7 +12,7 @@
 
 #include "srchtest.h"
 #if !UCONFIG_NO_BREAK_ITERATION
-#include "../cintltst/usrchdat.c"
+#include "../cintltst/usrchdat.inc"
 #endif
 #include "unicode/stsearch.h"
 #include "unicode/ustring.h"

diff --git a/icu4c/source/test/testdata/ssearch.xml b/icu4c/source/test/testdata/ssearch.xml
@@ -83,7 +83,7 @@
  </test-case>
 
 
- <!-- Test cases from usrchdat.c BREAKITERATOREXACT -->
+ <!-- Test cases from usrchdat.inc BREAKITERATOREXACT -->
 
  <test-case id="test10" strength="TERTIARY">
  <pattern>fox</pattern>
@@ -116,7 +116,7 @@
  </test-case>
 
 
- <!-- Test cases from usrchdat.c STRENGTH -->
+ <!-- Test cases from usrchdat.inc STRENGTH -->
 
 
  <test-case id="test15" strength="PRIMARY" locale="en">
@@ -195,7 +195,7 @@
  </test-case>
 
 
- <!-- Test Cases from usrchdat.c, VARIABLE -->
+ <!-- Test Cases from usrchdat.inc, VARIABLE -->
  <test-case id="test27" strength="TERTIARY" locale="en">
  <pattern>blackbird</pattern>
  <pre>black-bird </pre><m>blackbird</m><post>...</post>
@@ -226,7 +226,7 @@
  </test-case>
 
 
- <!-- Normalization test cases from usrchdat.c -->
+ <!-- Normalization test cases from usrchdat.inc -->
  <test-case id="test32" strength="TERTIARY" norm="ON">
  <pattern>a\u0325\u0300</pattern>
  <pre></pre><m>a\u0300\u0325</m>
@@ -239,7 +239,7 @@
  </test-case>
 
 
- <!-- COMPOSITEBOUNDARIES from usrchdat.c
+ <!-- COMPOSITEBOUNDARIES from usrchdat.inc
  Boundaries are not identical to original test data because
  of matching only full combining sequences
  -->
@@ -260,7 +260,7 @@
 
 
 
- <!-- SUPPLEMENTARYCANONICAL from usrchdat.c -->
+ <!-- SUPPLEMENTARYCANONICAL from usrchdat.inc -->
  <test-case id="test50" strength="TERTIARY">
  <pattern>\uD800\uDC00</pattern>
  <pre>abc \uD802\uDC00 \uD800\uDC01 \uD801\uDC00 </pre><m>\uD800\uDC00</m>