ICU-4674 refix the streamlining of modular builds

X-SVN-Rev: 20486
This commit is contained in:
Ram Viswanadha 2006-10-04 22:11:26 +00:00
parent 820cc4cc73
commit 2c72117792
3 changed files with 22 additions and 14 deletions

View file

@ -185,7 +185,7 @@
encoding="ascii">
<exclude name="**/CVS/**/*"/>
<include name="com/ibm/icu/charset/**/*.java"/>
<include name="com/ibm/icu/impl/**/*.java"/>
<include name="com/ibm/icu/lang/*.java"/>
<include name="com/ibm/icu/math/**/*.java"/>
@ -1040,8 +1040,9 @@
<include name="com/ibm/icu/text/SymbolTable.java"/>
<include name="com/ibm/icu/text/UnicodeFilter.java"/>
<include name="com/ibm/icu/text/UnicodeMatcher.java"/>
<include name="com/ibm/icu/text/UnicodeSet.java"/>
<include name="com/ibm/icu/text/UnicodeSet.java"/>
<include name="com/ibm/icu/text/UnicodeSetIterator.java"/>
<include name="com/ibm/icu/util/Freezable.java"/>
<include name="com/ibm/icu/util/RangeValueIterator.java"/>
<include name="com/ibm/icu/util/StringTokenizer.java"/>
<include name="com/ibm/icu/util/ULocale.java"/>

View file

@ -6,6 +6,9 @@
*/
package com.ibm.icu.dev.test;
import java.util.Date;
import com.ibm.icu.util.Calendar;
import com.ibm.icu.util.VersionInfo;
public abstract class AbstractTestLog implements TestLog {
@ -93,4 +96,12 @@ public abstract class AbstractTestLog implements TestLog {
}
}
}
public boolean isDateAtLeast(int year, int month, int day){
Calendar c = Calendar.getInstance();
Date dt = new Date(year, month, day);
if(c.getTime().compareTo(dt)>=0){
return true;
}
return false;
}
}

View file

@ -10,7 +10,6 @@ package com.ibm.icu.dev.test;
import com.ibm.icu.text.UTF16;
import com.ibm.icu.text.DecimalFormat;
import com.ibm.icu.text.NumberFormat;
import com.ibm.icu.util.Calendar;
import com.ibm.icu.util.TimeZone;
import com.ibm.icu.util.ULocale;
import java.io.ByteArrayOutputStream;
@ -25,7 +24,6 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Date;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.Random;
@ -77,6 +75,9 @@ public class TestFmwk extends AbstractTestLog {
ex = ((ExceptionInInitializerError)ex).getException();
}
String msg = ex.getMessage();
if(msg==null){
msg = "";
}
//System.err.println("TF handleException msg: " + msg);
if (ex instanceof MissingResourceException || ex instanceof NoClassDefFoundError || msg.indexOf("java.util.MissingResourceException")>=0) {
if (params.warnings || params.nodata) {
@ -376,8 +377,11 @@ public class TestFmwk extends AbstractTestLog {
handleException(e);
}catch (NoClassDefFoundError e) {
handleException(e);
}catch (Exception o){
System.out.println(o);
}catch (Exception e){
/*errln("Encountered: "+ e.toString());
e.printStackTrace(System.err);
*/
handleException(e);
}
}
}
@ -1775,12 +1779,4 @@ public class TestFmwk extends AbstractTestLog {
private final static String spaces = " ";
public boolean isDateAtLeast(int year, int month, int day){
Calendar c = Calendar.getInstance();
Date dt = new Date(year, month, day);
if(c.getTime().compareTo(dt)>=0){
return true;
}
return false;
}
}