ICU-2491 made default max codepoints to run be 0x10ffff when wchar_t supports it.

makefile updated too.

X-SVN-Rev: 13806
This commit is contained in:
Syn Wee Quek 2003-11-21 06:18:48 +00:00
parent bd28e5eb9d
commit 73e1d793e7
3 changed files with 18 additions and 10 deletions

View file

@ -1,4 +1,4 @@
## Makefile.in for ICU - test/ucharperf
## Makefile.in for ICU - test/charperf
## Copyright (c) 2001, International Business Machines Corporation and
## others. All Rights Reserved.
@ -6,7 +6,7 @@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = ../..
top_builddir = ../../..
include $(top_builddir)/icudefs.mk
@ -14,16 +14,16 @@ include $(top_builddir)/icudefs.mk
include @platform_make_fragment@
## Build directory information
subdir = test/ucharperf
subdir = test/charperf
## Extra files to remove for 'make clean'
CLEANFILES = *~ $(DEPS)
## Target information
TARGET = ucharperf
TARGET = charperf
DEFS = @DEFS@
CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common
CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/tools/toolutil
CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
ENABLE_RPATH = @ENABLE_RPATH@
@ -31,9 +31,9 @@ ifeq ($(ENABLE_RPATH),YES)
RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
endif
LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
LIBS = $(LIBICUUC) @LIBS@ @LIB_M@
LIBS = $(LIBICUUC) $(LIBICUTOOLUTIL) @LIBS@ @LIB_M@
OBJECTS = ucharperf.o
OBJECTS = charperf.o
DEPS = $(OBJECTS:.o=.d)

View file

@ -68,8 +68,15 @@ CharPerformanceTest::CharPerformanceTest(int32_t argc, const char *argv[],
(int32_t)(sizeof(options)/sizeof(options[0])), options);
}
MIN_ = 0;
MAX_ = 0xffff;
if (sizeof(wchar_t) > 2) {
// for stdlibs like glibc that supports 32 bits wchar
// we test for the whole unicode character set by default
MAX_ = 0x10ffff;
}
else {
MAX_ = 0xffff;
}
printf("MAX_ size will be 0x%x\n", MAX_);
if (options[MIN_OPTION_].doesOccur) {
MIN_ = atoi(options[MIN_OPTION_].value);
}

View file

@ -13,6 +13,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <wchar.h>
#include <wctype.h>
typedef void (*CharPerfFn)(UChar32 ch);
typedef void (*StdLibCharPerfFn)(wchar_t ch);
@ -234,4 +235,4 @@ inline void StdLibIsWhiteSpace(wchar_t ch)
iswspace(ch);
}
#endif // CHARPERF_H
#endif // CHARPERF_H