ICU-491.11.1.tar.gz

[apple/icu.git] / icuSources / test / intltest / dadrcoll.cpp

diff --git a/icuSources/test/intltest/dadrcoll.cpp b/icuSources/test/intltest/dadrcoll.cpp
index f37abedd4f4099d0a7745622509c0307a229e715..62248096f3132740f7d71001890d640209c29b65 100644 (file)
--- a/icuSources/test/intltest/dadrcoll.cpp
+++ b/icuSources/test/intltest/dadrcoll.cpp
@@ -1,6 +1,6 @@
 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2008, International Business Machines Corporation and
+ * Copyright (c) 1997-2010, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 
@@ -17,7 +17,7 @@
 
 #include "unicode/utypes.h"
 
-#if !UCONFIG_NO_COLLATION
+#if !UCONFIG_NO_COLLATION && !UCONFIG_NO_FILE_IO
 
 #include "unicode/uchar.h"
 #include "unicode/tstdtmod.h"
@@ -73,7 +73,7 @@ void DataDrivenCollatorTest::runIndexedTest( int32_t index, UBool exec, const ch
       name = "";
     }
   } else {
-    dataerrln("[DATA] collate/DataDrivenTest data not initialized!");
+    dataerrln("collate/DataDrivenTest data not initialized!");
     name = "";
   }
 
@@ -196,11 +196,12 @@ DataDrivenCollatorTest::processTest(TestData *testData) {
         if(U_SUCCESS(status)) {
           logln("Testing collator for rules "+testSetting);
         } else {
-          errln("Unable to instantiate collator for rules "+testSetting);
+          errln("Unable to instantiate collator for rules "+testSetting+" - "+u_errorName(status));
           return;
         }
       } else {
         errln("No collator definition!");
+        return;
       }
     }