diff --git a/icu4c/source/test/testdata/Makefile.in b/icu4c/source/test/testdata/Makefile.in index 7b47e4cc10..051b511392 100644 --- a/icu4c/source/test/testdata/Makefile.in +++ b/icu4c/source/test/testdata/Makefile.in @@ -1,6 +1,6 @@ #****************************************************************************** # -# Copyright (C) 1998-2004, International Business Machines +# Copyright (C) 1998-2005, International Business Machines # Corporation and others. All Rights Reserved. # #****************************************************************************** @@ -106,7 +106,7 @@ TEST_UCM_SOURCE= test1.ucm test3.ucm test4.ucm test4x.ucm ibm9027.ucm 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 structLocale.txt DataDrivenCollationTest.txt idna_rules.txt conversion.txt icuio.txt testtable32.txt +TEST_RES = casing.txt mc.txt root.txt sh.txt sh_YU.txt te.txt te_IN.txt te_IN_REVISED testtypes.txt testaliases.txt testempty.txt structLocale.txt DataDrivenCollationTest.txt idna_rules.txt conversion.txt icuio.txt testtable32.txt 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/testdata/root.txt b/icu4c/source/test/testdata/root.txt index c8c6c5adf1..75673de697 100644 --- a/icu4c/source/test/testdata/root.txt +++ b/icu4c/source/test/testdata/root.txt @@ -1,6 +1,6 @@ //******************************************************************************* //* -//* Copyright (C) 1998-2000, International Business Machines +//* Copyright (C) 1998-2005, International Business Machines //* Corporation and others. All Rights Reserved. //* //******************************************************************************* @@ -97,6 +97,12 @@ root rootAliasTable { destination { "correct" } } + a { + a1{"ar1"} + a2{"ar2"} + a3{"ar3"} + a4{"ar4"} + } } //eof diff --git a/icu4c/source/test/testdata/sh.txt b/icu4c/source/test/testdata/sh.txt new file mode 100644 index 0000000000..0519dadac2 --- /dev/null +++ b/icu4c/source/test/testdata/sh.txt @@ -0,0 +1,14 @@ +//******************************************************************************* +//* +//* Copyright (C) 2005, International Business Machines +//* Corporation and others. All Rights Reserved. +//* +//******************************************************************************* + +sh{ + a{ + a1{"a01"} + a2{"a02"} + a3{"a03"} + } + } \ No newline at end of file diff --git a/icu4c/source/test/testdata/sh_YU.txt b/icu4c/source/test/testdata/sh_YU.txt new file mode 100644 index 0000000000..bdd009d8b0 --- /dev/null +++ b/icu4c/source/test/testdata/sh_YU.txt @@ -0,0 +1,12 @@ +//******************************************************************************* +//* +//* Copyright (C) 2005, International Business Machines +//* Corporation and others. All Rights Reserved. +//* +//******************************************************************************* + +sh_YU{ + a{ + a2{"a12"} + } + } \ No newline at end of file diff --git a/icu4c/source/test/testdata/te.txt b/icu4c/source/test/testdata/te.txt index 745b0c8d9a..e665ae48a9 100644 --- a/icu4c/source/test/testdata/te.txt +++ b/icu4c/source/test/testdata/te.txt @@ -101,7 +101,12 @@ te aliasClient:alias {"/LOCALE/aliasDestination"} aliasDestination {"tedest"} rootAliasDestination {"correct"} - + a { + a1{"a21"} + a2{"a22"} + a3{"a23"} + a4{"a24"} + } } //eof diff --git a/icu4c/source/test/testdata/te_IN.txt b/icu4c/source/test/testdata/te_IN.txt index 48ae2a540f..6d2aa73b05 100644 --- a/icu4c/source/test/testdata/te_IN.txt +++ b/icu4c/source/test/testdata/te_IN.txt @@ -89,6 +89,8 @@ te_IN tag7 { TE_IN7 } } aliasDestination {"correct" } + + a:alias{ "sh_YU"} } //eof diff --git a/icu4c/source/test/testdata/testdata.mak b/icu4c/source/test/testdata/testdata.mak index dbe0f079ef..1e53ede98c 100644 --- a/icu4c/source/test/testdata/testdata.mak +++ b/icu4c/source/test/testdata/testdata.mak @@ -1,5 +1,5 @@ #********************************************************************** -#* Copyright (C) 1999-2004, International Business Machines Corporation +#* Copyright (C) 1999-2005, International Business Machines Corporation #* and others. All Rights Reserved. #********************************************************************** # @@ -23,7 +23,7 @@ ALL : "$(TESTDATAOUT)\testdata.dat" # icu26e_testtypes.res is the same, but icuswapped to big-endian EBCDIC # markus 2003nov21 -"$(TESTDATAOUT)\testdata.dat" : "$(TESTDATABLD)\casing.res" "$(TESTDATABLD)\conversion.res" "$(TESTDATABLD)\icuio.res" "$(TESTDATABLD)\mc.res" "$(TESTDATABLD)\structLocale.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" +"$(TESTDATAOUT)\testdata.dat" : "$(TESTDATABLD)\casing.res" "$(TESTDATABLD)\conversion.res" "$(TESTDATABLD)\icuio.res" "$(TESTDATABLD)\mc.res" "$(TESTDATABLD)\structLocale.res" "$(TESTDATABLD)\root.res" "$(TESTDATABLD)\sh.res" "$(TESTDATABLD)\sh_YU.res" "$(TESTDATABLD)\te.res" "$(TESTDATABLD)\te_IN.res" "$(TESTDATABLD)\te_IN_REVISED.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)" @@ -34,8 +34,11 @@ $(TESTDT)conversion.res $(TESTDT)mc.res $(TESTDT)root.res $(TESTDT)testtable32.res +$(TESTDT)sh.res +$(TESTDT)sh_YU.res $(TESTDT)te.res $(TESTDT)te_IN.res +$(TESTDT)te_IN_REVISED.res $(TESTDT)testtypes.res $(TESTDT)icu26_testtypes.res $(TESTDT)icu26e_testtypes.res