Update ICU to 54.1 step 1

source/test/cintltst/cfintst.c

Index: source/test/cintltst/cfintst.c
diff --git a/source/test/cintltst/cfintst.c b/source/test/cintltst/cfintst.c
index 1bc8cfd16329d15684f0e02a7b159a74e30d296a..b4d36a8e43b161bed05388d72023d634a189d87f 100644
--- a/source/test/cintltst/cfintst.c
+++ b/source/test/cintltst/cfintst.c
@@ -1,5 +1,5 @@
 /********************************************************************
- * Copyright (c) 1997-2009, International Business Machines
+ * Copyright (c) 1997-2009,2014, International Business Machines
  * Corporation and others. All Rights Reserved.
  ********************************************************************
  *
@@ -56,7 +56,7 @@ const static UCollationResult results[] = {
     UCOL_GREATER,
     UCOL_LESS,
     /* test primary > 4*/
-    UCOL_EQUAL
+    UCOL_GREATER    /* v < w per cldrbug 6615 */
 };
 
 
@@ -65,8 +65,8 @@ 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");
     
 
 
@@ -100,7 +100,7 @@ static void TestPrimary()
     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++)
     {