ICU 56 update step 1

source/test/testdata/testdata.mak

 #**********************************************************************
-#* Copyright (C) 1999-2014, International Business Machines Corporation
+#* Copyright (C) 1999-2015, International Business Machines Corporation
 #* and others.  All Rights Reserved.
 #**********************************************************************
 #
 #   03/19/2001  weiv, schererm  Created
 
 .SUFFIXES : .res .txt
 
 TESTPKG=testdata
 TESTDT=$(TESTPKG)
 
 
 ALL : "$(TESTDATAOUT)\testdata.dat" 
         @echo Test data is built.
 
 # old_l_testtypes.res is there for cintltst/udatatst.c/TestSwapData()
 # I generated it with an ICU 4.2.1 build on Linux after removing
 # testincludeUTF (which would make it large, unnecessarily for this test)
 # and renaming the collations element to avoid build CollationElements
 # (which will not work with a newer swapper)
 # markus 2010jan15
 
 # old_e_testtypes.res is the same, but icuswapped to big-endian EBCDIC
 
 # the following file has $(TEST_RES_SOURCE)
 !INCLUDE "$(TESTDATA)\tstfiles.mk"
 
 TEST_RES_FILES = $(TEST_RES_SOURCE:.txt=.res)
 
-"$(TESTDATAOUT)\testdata.dat" : $(TEST_RES_FILES) "$(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)\iscii.res" "$(TESTDATABLD)\idna_rules.res" "$(TESTDATABLD)\test.icu" "$(TESTDATABLD)\testtable32.res" "$(TESTDATABLD)\test1.cnv" "$(TESTDATABLD)\test1bmp.cnv" "$(TESTDATABLD)\test2.cnv" "$(TESTDATABLD)\test3.cnv" "$(TESTDATABLD)\test4.cnv" "$(TESTDATABLD)\test4x.cnv" "$(TESTDATABLD)\test5.cnv" "$(TESTDATABLD)\ibm9027.cnv" "$(TESTDATABLD)\nfscsi.spp" "$(TESTDATABLD)\nfscss.spp" "$(TESTDATABLD)\nfscis.spp" "$(TESTDATABLD)\nfsmxs.spp" "$(TESTDATABLD)\nfsmxp.spp" "$(TESTDATABLD)\testnorm.nrm" "$(TESTDATABLD)\zoneinfo64.res"
+"$(TESTDATAOUT)\testdata.dat" : $(TEST_RES_FILES) "$(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)\encoded.res" "$(TESTDATABLD)\idna_rules.res" "$(TESTDATABLD)\test.icu" "$(TESTDATABLD)\testtable32.res" "$(TESTDATABLD)\test1.cnv" "$(TESTDATABLD)\test1bmp.cnv" "$(TESTDATABLD)\test2.cnv" "$(TESTDATABLD)\test3.cnv" "$(TESTDATABLD)\test4.cnv" "$(TESTDATABLD)\test4x.cnv" "$(TESTDATABLD)\test5.cnv" "$(TESTDATABLD)\ibm9027.cnv" "$(TESTDATABLD)\nfscsi.spp" "$(TESTDATABLD)\nfscss.spp" "$(TESTDATABLD)\nfscis.spp" "$(TESTDATABLD)\nfsmxs.spp" "$(TESTDATABLD)\nfsmxp.spp" "$(TESTDATABLD)\testnorm.nrm" "$(TESTDATABLD)\zoneinfo64.res"
         @echo Building test data
         @copy "$(TESTDATABLD)\te.res" "$(TESTDATAOUT)\$(TESTDT)\nam.typ"
         @copy "$(TESTDATA)\old_l_testtypes.res" "$(TESTDATABLD)"
         @copy "$(TESTDATA)\old_e_testtypes.res" "$(TESTDATABLD)"
         @copy "$(TESTDATABLD)\zoneinfo64.res" "$(TESTDATAOUT)\$(TESTDT)"
         "$(ICUPBIN)\pkgdata" -f -v -m common -c -p"$(TESTPKG)" -d "$(TESTDATAOUT)" -T "$(TESTDATABLD)" -s "$(TESTDATABLD)" <<
 casing.res
 conversion.res
 mc.res
 root.res
 testtable32.res
 sh.res
 sh_YU.res
 te.res
 te_IN.res
 te_IN_REVISED.res
 testtypes.res
 old_l_testtypes.res
 old_e_testtypes.res
 testempty.res
 testaliases.res
 structLocale.res
 icuio.res
-iscii.res
+encoded.res
 test.icu
 test1.cnv
 test1bmp.cnv
 test2.cnv
 test3.cnv
 test4.cnv
 test4x.cnv
 test5.cnv
 ibm9027.cnv
 idna_rules.res
 nfscsi.spp
 nfscss.spp
 nfscis.spp
 nfsmxs.spp
 nfsmxp.spp
 testnorm.nrm
 $(TEST_RES_FILES:.res =.res
 )
 <<
 
 
 # Inference rule for creating resource bundles
 # Some test data resource bundles are known to have warnings and bad data.
 # The -q option is there on purpose, so we don't see it normally.
 {$(TESTDATA)}.txt.res:: 
         @echo Making Test Resource Bundle files $<
         @"$(ICUTOOLS)\genrb\$(CFG)\genrb" -q -s"$(TESTDATA)" -d"$(TESTDATABLD)" $<
 
-"$(TESTDATABLD)\iscii.res": "$(TESTDATA)\iscii.bin"
-        @echo Making Test Resource Bundle file with encoding ISCII,version=0
-        @"$(ICUTOOLS)\genrb\$(CFG)\genrb" -s"$(TESTDATA)" -eISCII,version=0 -d"$(TESTDATABLD)" iscii.bin
+"$(TESTDATABLD)\encoded.res": "$(TESTDATA)\encoded.utf16be"
+        @echo Making Test Resource Bundle file with encoding
+        "$(ICUTOOLS)\genrb\$(CFG)\genrb" -s"$(TESTDATA)" -eUTF-16BE -d"$(TESTDATABLD)" encoded.utf16be
 
 "$(TESTDATABLD)\idna_rules.res": "$(TESTDATA)\idna_rules.txt"
         @echo Making Test Resource Bundle file for IDNA reference implementation
         @"$(ICUTOOLS)\genrb\$(CFG)\genrb" -s"$(TESTDATA)" -d"$(TESTDATABLD)" idna_rules.txt
 
 
 "$(TESTDATABLD)\test.icu" : {"$(ICUTOOLS)\gentest\$(CFG)"}gentest.exe
         "$(ICUTOOLS)\gentest\$(CFG)\gentest" -d"$(TESTDATABLD)"
 
 # testtable32 resource file
@@ skipping 59 matching lines @@
         @"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" --small -d"$(TESTDATABLD)" $**
 
 "$(TESTDATABLD)\ibm9027.cnv": "$(TESTDATA)\ibm9027.ucm"
         @echo Building $@
         @"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" --small -d"$(TESTDATABLD)" $**
 
 # Target for test normalization data
 "$(TESTDATABLD)\testnorm.nrm": "$(TESTDATA)\testnorm.txt"
         @echo Building $@
         @"$(ICUTOOLS)\gennorm2\$(CFG)\gennorm2" -s "$(TESTDATA)" testnorm.txt -o $@