diff --git a/.gitattributes b/.gitattributes index 11655e2d770..4aa685b34b9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -54,6 +54,7 @@ icu4c/source/samples/ucnv/data02.bin -text icu4c/source/test/testdata/importtest.bin -text icu4c/source/test/testdata/iscii.bin -text icu4c/source/test/testdata/testdata_icu26_testtypes.res -text +icu4c/source/test/testdata/testdata_icu26e_testtypes.res -text icu4c/source/test/testdata/uni-text.bin -text icu4j/src/com/ibm/icu/dev/data/ThaiWordFreq.xls -text icu4j/src/com/ibm/icu/dev/data/holidays_jp.ucs -text diff --git a/icu4c/source/data/Makefile.in b/icu4c/source/data/Makefile.in index 952422b88f2..d5e14eeecd4 100644 --- a/icu4c/source/data/Makefile.in +++ b/icu4c/source/data/Makefile.in @@ -335,7 +335,7 @@ TEST_UCM_FILES=$(TEST_UCM_SOURCE:%=$(TESTSRCDATADIR)/data/%) TEST_CNV_FILES=$(TEST_UCM_SOURCE:%.ucm=$(TESTBUILDDIR)/$(TESTDT)%.cnv) TEST_RES = casing.txt mc.txt root.txt te.txt te_IN.txt testtypes.txt testaliases.txt testempty.txt DataDrivenCollationTest.txt idna_rules.txt conversion.txt testtable32.txt -TEST_RES_FILES=$(TEST_RES:%.txt=$(TESTBUILDDIR)/$(TESTDT)%.res) $(TESTBUILDDIR)/$(TESTDT)iscii.res $(TESTSRCDATADIR)/$(TESTDT)icu26_testtypes.res +TEST_RES_FILES=$(TEST_RES:%.txt=$(TESTBUILDDIR)/$(TESTDT)%.res) $(TESTBUILDDIR)/$(TESTDT)iscii.res $(TESTSRCDATADIR)/$(TESTDT)icu26_testtypes.res $(TESTSRCDATADIR)/$(TESTDT)icu26e_testtypes.res ALL_TEST_FILES = $(TEST_DAT_FILES) $(TEST_BRK_FILES) $(TEST_CNV_FILES) $(TEST_RES_FILES) $(TESTOUTDIR)/$(TESTDT)nam.typ diff --git a/icu4c/source/test/cintltst/udatatst.c b/icu4c/source/test/cintltst/udatatst.c index 50ff188cf72..23d4f5d5471 100644 --- a/icu4c/source/test/cintltst/udatatst.c +++ b/icu4c/source/test/cintltst/udatatst.c @@ -1040,8 +1040,10 @@ static const struct { /* ICU's root */ "root", "res", ures_swap, - /* ICU 2.6 resource bundle - data format 1.0, without indexes[] */ + /* ICU 2.6 resource bundle - data format 1.0, without indexes[] (little-endian ASCII) */ "*icu26_testtypes", "res", ures_swap, + /* same for big-endian EBCDIC */ + "*icu26e_testtypes", "res", ures_swap, #if !UCONFIG_NO_COLLATION /* standalone collation data files */ diff --git a/icu4c/source/test/testdata/testdata.mk b/icu4c/source/test/testdata/testdata.mk index dec25163b56..0a3b56695e4 100644 --- a/icu4c/source/test/testdata/testdata.mk +++ b/icu4c/source/test/testdata/testdata.mk @@ -20,10 +20,14 @@ ALL : "$(TESTDATAOUT)\testdata.dat" # and CollationElements (which will not work with a newer swapper) # markus 2003nov19 +# icu26e_testtypes.res is the same, but icuswapped to big-endian EBCDIC +# markus 2003nov21 + "$(TESTDATAOUT)\testdata.dat" : "$(TESTDATABLD)\casing.res" "$(TESTDATABLD)\conversion.res" "$(TESTDATABLD)\mc.res" "$(TESTDATABLD)\root.res" "$(TESTDATABLD)\te.res" "$(TESTDATABLD)\te_IN.res" "$(TESTDATABLD)\testaliases.res" "$(TESTDATABLD)\testtypes.res" "$(TESTDATABLD)\testempty.res" "$(TESTDATABLD)\$(TESTDT)iscii.res" "$(TESTDATABLD)\$(TESTDT)idna_rules.res" "$(TESTDATABLD)\DataDrivenCollationTest.res" "$(TESTDATABLD)\$(TESTDT)test.icu" "$(TESTDATABLD)\$(TESTDT)testtable32.res" "$(TESTDATABLD)\$(TESTDT)test1.cnv" "$(TESTDATABLD)\$(TESTDT)test3.cnv" "$(TESTDATABLD)\$(TESTDT)test4.cnv" "$(TESTDATABLD)\$(TESTDT)test4x.cnv" "$(TESTDATABLD)\$(TESTDT)ibm9027.cnv" "$(TESTDATABLD)\$(TESTDT)nfscsi.spp" "$(TESTDATABLD)\$(TESTDT)nfscss.spp" "$(TESTDATABLD)\$(TESTDT)nfscis.spp" "$(TESTDATABLD)\$(TESTDT)nfsmxs.spp" "$(TESTDATABLD)\$(TESTDT)nfsmxp.spp" @echo Building test data @copy "$(TESTDATABLD)\$(TESTDT)te.res" "$(TESTDATAOUT)\$(TESTDT)nam.typ" @copy "$(TESTDATA)\$(TESTDT)icu26_testtypes.res" "$(TESTDATABLD)" + @copy "$(TESTDATA)\$(TESTDT)icu26e_testtypes.res" "$(TESTDATABLD)" @"$(ICUP)\bin\pkgdata" -f -v -m common -c -p"$(TESTPKG)" -d "$(TESTDATAOUT)" -T "$(TESTDATABLD)" -s "$(TESTDATABLD)" << $(TESTDT)casing.res $(TESTDT)conversion.res @@ -34,6 +38,7 @@ $(TESTDT)te.res $(TESTDT)te_IN.res $(TESTDT)testtypes.res $(TESTDT)icu26_testtypes.res +$(TESTDT)icu26e_testtypes.res $(TESTDT)testempty.res $(TESTDT)testaliases.res $(TESTDT)iscii.res diff --git a/icu4c/source/test/testdata/testdata_icu26e_testtypes.res b/icu4c/source/test/testdata/testdata_icu26e_testtypes.res new file mode 100644 index 00000000000..89acde07914 Binary files /dev/null and b/icu4c/source/test/testdata/testdata_icu26e_testtypes.res differ