X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/374ca955a76ecab1204ca8bfa63ff9238d998416..9f1b115531acc2f3640893f76e8bcf6680033062:/icuSources/test/cintltst/Makefile.in

diff --git a/icuSources/test/cintltst/Makefile.in b/icuSources/test/cintltst/Makefile.in
index 8e012599..584c592e 100644
--- a/icuSources/test/cintltst/Makefile.in
+++ b/icuSources/test/cintltst/Makefile.in
@@ -1,6 +1,12 @@
+# Copyright (C) 2016 and later: Unicode, Inc. and others.
+# License & terms of use: http://www.unicode.org/copyright.html
+#******************************************************************************
+#
+#   Copyright (C) 1999-2016, International Business Machines
+#   Corporation and others.  All Rights Reserved.
+#
+#******************************************************************************
 ## Makefile.in for ICU - test/cintltst
-## Copyright (c) 1999-2004, International Business Machines Corporation and
-## others. All Rights Reserved.
 
 ## Source directory information
 srcdir = @srcdir@
@@ -8,53 +14,57 @@ top_srcdir = @top_srcdir@
 
 top_builddir = ../..
 
+## All the flags and other definitions are included here.
 include $(top_builddir)/icudefs.mk
 
 ## Build directory information
 subdir = test/cintltst
 
 ## Extra files to remove for 'make clean'
-CLEANFILES = *~ $(DEPS)
+CLEANFILES = *~ $(DEPS) $(TESTXML)
 
 ## Target information
 TARGET = cintltst$(EXEEXT)
 
-# Oh, this hurts my sensibility. This is supposedly a C test and we need to
-# link using a C++ compiler?! This must be done so that C++ static
-# initialization works in the libraries, like mutex.cpp, ustdio and iostream.
-
-ifneq ($(ENABLE_STATIC),)
-LINK = $(LINK.cc)
-else
-LINK = $(LINK.c)
-endif
-
 BUILDDIR := $(CURR_SRCCODE_FULL_DIR)/../../
+# Simplify the path for Unix
 BUILDDIR := $(BUILDDIR:test/cintltst/../../=)
-BUILDDIR := $(BUILDDIR:test\\\\cintltst/../../=)
+# Simplify the path for Windows
+BUILDDIR := $(BUILDDIR:test\\cintltst/../../=)
+# Simplify the path for Windows 98
+BUILDDIR := $(BUILDDIR:TEST\\CINTLTST/../../=)
 
 # we define ICU_UNICODE_VERSION so we can test it
-CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/tools/toolutil
+CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/tools/toolutil
 DEFS += -D'ICU_UNICODE_VERSION="$(UNICODE_VERSION)"' -D'ICU_VERSION="@VERSION@"' -D'ICUDATA_NAME="$(ICUDATA_PLATFORM_NAME)"' -D'U_TOPSRCDIR="$(top_srcdir)/"' -D'U_TOPBUILDDIR="$(BUILDDIR)"'
-LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M)
-
-OBJECTS = callcoll.o calltest.o colutil.o capitst.o cbiapts.o cbkittst.o \
-ccaltst.o cctest.o ccapitst.o ccolltst.o cconvtst.o ccurrtst.o cdantst.o	\
-cdattst.o cdetst.o cdtdptst.o cdtrgtst.o cestst.o cfintst.o cformtst.o \
-cfrtst.o cg7coll.o chashtst.o cintltst.o citertst.o cjaptst.o cloctst.o \
-cmsccoll.o cmsgtst.o cposxtst.o cldrtest.o \
-cnmdptst.o cnormtst.o cnumtst.o cregrtst.o crestst.o creststn.o cturtst.o \
-cucdapi.o cucdtst.o custrtst.o cstrcase.o cutiltst.o encoll.o nucnvtst.o nccbtst.o bocu1tst.o \
+LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
+
+OBJECTS = callcoll.o calltest.o capitst.o cbiapts.o cbkittst.o \
+ccaltst.o ucnvseltst.o cctest.o ccapitst.o ccolltst.o encoll.o cconvtst.o ccurrtst.o \
+cdateintervalformattest.o cdattst.o cdetst.o cdtdptst.o cdtrgtst.o cestst.o cfintst.o \
+cformtst.o cfrtst.o cg7coll.o chashtst.o cintltst.o citertst.o cjaptst.o cloctst.o \
+cmeasureformattest.o \
+cmsccoll.o cmsgtst.o cpluralrulestest.o cposxtst.o cldrtest.o \
+cnmdptst.o cnormtst.o cnumtst.o crelativedateformattest.o crestst.o creststn.o cturtst.o \
+cucdapi.o cucdtst.o custrtst.o cstrcase.o cutiltst.o nucnvtst.o nccbtst.o bocu1tst.o \
 cbiditst.o cbididat.o eurocreg.o udatatst.o utf16tst.o utransts.o \
-ncnvfbts.o ncnvtst.o putiltst.o cstrtest.o utf8tst.o ucmptst.o \
-stdnmtst.o ctstdep.o usrchtst.o custrtrn.o sorttest.o trietest.o usettest.o uenumtst.o utmstest.o \
-idnatest.o nfsprep.o spreptst.o sprpdata.o hpmufn.o tracetst.o reapits.o
+ncnvfbts.o ncnvtst.o putiltst.o cstrtest.o udatpg_test.o utf8tst.o \
+stdnmtst.o usrchtst.o custrtrn.o sorttest.o trietest.o trie2test.o usettest.o \
+uenumtst.o utmstest.o currtest.o \
+idnatest.o nfsprep.o spreptst.o sprpdata.o \
+hpmufn.o tracetst.o reapits.o uregiontest.o ulistfmttest.o\
+utexttst.o ucsdetst.o spooftest.o \
+cbiditransformtst.o \
+cgendtst.o
 
 DEPS = $(OBJECTS:.o=.d)
 
+-include Makefile.local
+
 ## List of phony targets
 .PHONY : all all-local install install-local clean clean-local	\
-distclean distclean-local dist dist-local check check-local
+distclean distclean-local dist dist-local check check-local xcheck	\
+check-exhaustive check-exhaustive-local
 
 ## Clear suffix list
 .SUFFIXES :
@@ -66,6 +76,8 @@ clean: clean-local
 distclean : distclean-local
 dist: dist-local
 check: all check-local
+xcheck: all xcheck-local
+check-exhaustive: all check-exhaustive-local
 
 all-local: $(TARGET)
 
@@ -80,17 +92,25 @@ clean-local:
 distclean-local: clean-local
 	$(RMV) Makefile
 
--include Makefile.local
+# cintltest gets $(THREADSENVFLAGS) - just in case we get a threaded cintltst.
 
 check-local: all-local
-	$(INVOKE) ./$(TARGET) $(CINTLTST_OPTS)
+	$(THREADSENVFLAGS) $(INVOKE) ./$(TARGET) $(TEST_OUTPUT_OPTS) $(CINTLTST_OPTS)
+
+check-exhaustive-local: all-local
+	$(THREADSENVFLAGS) $(INVOKE) ./$(TARGET) $(TEST_OUTPUT_OPTS) -e
+
+TESTXML=$(top_builddir)/test-$(TARGET).xml
+xcheck-local: all-local
+	$(THREADSENVFLAGS) $(INVOKE) ./$(TARGET) $(TEST_OUTPUT_OPTS) $(CINTLTST_OPTS) -x $(TESTXML)
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(TARGET) : $(OBJECTS)
-	$(LINK) $(OUTOPT)$@ $^ $(LIBS)
+	$(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
+	$(POST_BUILD_STEP)
 
 ifeq (,$(MAKECMDGOALS))
 -include $(DEPS)