Update ICU to 54.1 step 1

source/test/cintltst/cfintst.c

 /********************************************************************
- * Copyright (c) 1997-2009, International Business Machines
+ * Copyright (c) 1997-2009,2014, International Business Machines
  * Corporation and others. All Rights Reserved.
  ********************************************************************
  *
  * File CFINTST.C
  *
  * Modification History:
  *        Name                     Description            
  *     Madhu Katragadda            Ported for C API
  ********************************************************************
  */
@@ skipping 36 matching lines @@
     {0x004c/*'L'*/, 0x00E4, 0x0077/*'w'*/, 0x0065/*'e'*/, 0x0000},
     {0x0076/*'v'*/, 0x0061/*'a'*/, 0x0074/*'t'*/, 0x0000}
 };
 
 const static UCollationResult results[] = {
     UCOL_GREATER,
     UCOL_LESS,
     UCOL_GREATER,
     UCOL_LESS,
     /* test primary > 4*/
-    UCOL_EQUAL
+    UCOL_GREATER    /* v < w per cldrbug 6615 */
 };
 
 
 
 void addFinnishCollTest(TestNode** root)
 {
     
     
-    addTest(root, &TestPrimary, "tscoll/cficoll/TestPrimary");
-    addTest(root, &TestTertiary, "tscoll/cficoll/TestTertiary");
+    addTest(root, &TestPrimary, "tscoll/cfintst/TestPrimary");
+    addTest(root, &TestTertiary, "tscoll/cfintst/TestTertiary");
     
 
 
 }
 
 
 static void TestTertiary( )
 {
     
     int32_t i;
@@ skipping 13 matching lines @@
 
 static void TestPrimary()
 {
     
     int32_t i;
     UErrorCode status = U_ZERO_ERROR;
     myCollation = ucol_open("fi_FI@collation=standard", &status);
     if(U_FAILURE(status)){
         log_err_status(status, "ERROR: in creation of rule based collator: %s\n", myErrorName(status));
     }
-    log_verbose("Testing Finnish Collation with Tertiary strength\n");
+    log_verbose("Testing Finnish Collation with Primary strength\n");
     ucol_setStrength(myCollation, UCOL_PRIMARY);
     for (i = 4; i < 5; i++)
     {
         doTest(myCollation, testSourceCases[i], testTargetCases[i], results[i]);
     }
     ucol_close(myCollation);
 }
 
 #endif /* #if !UCONFIG_NO_COLLATION */