ICU-531.30.tar.gz

[apple/icu.git] / icuSources / test / iotest / Makefile.in

diff --git a/icuSources/test/iotest/Makefile.in b/icuSources/test/iotest/Makefile.in
index 39f70df2824c65200f78200a984d3eaf71dd633c..07e55f498e7d2d053b425e00ee00c999fd227afc 100644 (file)
--- a/icuSources/test/iotest/Makefile.in
+++ b/icuSources/test/iotest/Makefile.in
@@ -1,6 +1,6 @@
 #******************************************************************************
 #
 #******************************************************************************
 #

-#   Copyright (C) 1999-2011, International Business Machines
+#   Copyright (C) 1999-2014, International Business Machines

 #   Corporation and others.  All Rights Reserved.
 #
 #******************************************************************************
 #   Corporation and others.  All Rights Reserved.
 #
 #******************************************************************************


@@ -33,6 +33,7 @@ BUILDDIR := $(BUILDDIR:test\\iotest/../../=)
 BUILDDIR := $(BUILDDIR:TEST\\IOTEST/../../=)
 
 CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/io
 BUILDDIR := $(BUILDDIR:TEST\\IOTEST/../../=)
 
 CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/io

+CPPFLAGS += -DUNISTR_FROM_CHAR_EXPLICIT= -DUNISTR_FROM_STRING_EXPLICIT=

 DEFS += -D'U_TOPSRCDIR="$(top_srcdir)/"' -D'U_TOPBUILDDIR="$(BUILDDIR)"'
 LIBS = $(LIBCTESTFW) $(LIBICUTOOLUTIL) $(LIBICUIO) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 DEFS += -D'U_TOPSRCDIR="$(top_srcdir)/"' -D'U_TOPBUILDDIR="$(BUILDDIR)"'
 LIBS = $(LIBCTESTFW) $(LIBICUTOOLUTIL) $(LIBICUIO) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 


@@ -74,14 +75,14 @@ distclean-local: clean-local
        $(RMV) Makefile
 
 check-local: all-local
        $(RMV) Makefile
 
 check-local: all-local

-       $(INVOKE) ./$(TARGET) $(IOTEST_OPTS) 
+       $(INVOKE) ./$(TARGET) $(TEST_OUTPUT_OPTS) $(IOTEST_OPTS)

 
 check-exhaustive-local: all-local
 
 check-exhaustive-local: all-local

-       $(INVOKE) ./$(TARGET) -e
+       $(INVOKE) ./$(TARGET) $(TEST_OUTPUT_OPTS) -e

 
 TESTXML=$(top_builddir)/test-$(TARGET).xml
 xcheck-local: all-local
 
 TESTXML=$(top_builddir)/test-$(TARGET).xml
 xcheck-local: all-local

-       $(INVOKE) ./$(TARGET) $(IOTEST_OPTS) -x $(TESTXML)
+       $(INVOKE) ./$(TARGET) $(TEST_OUTPUT_OPTS) $(IOTEST_OPTS) -x $(TESTXML)

 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) \
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) \