[sword-cvs] icu-sword/source/tools/ctestfw Makefile.in,1.4,1.5 ctest.c,1.3,1.4 ctestfw.vcproj,1.1,1.2
sword@www.crosswire.org
sword@www.crosswire.org
Tue, 6 Apr 2004 03:11:00 -0700
- Previous message: [sword-cvs] icu-sword/source/tools Makefile.in,1.4,1.5
- Next message: [sword-cvs] icu-sword/source/test/usetperf bitset.cpp,1.1,1.2 bitset.h,1.1,1.2 timer.h,1.1,1.2 usetperf.cpp,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvs/core/icu-sword/source/tools/ctestfw
In directory www:/tmp/cvs-serv8911/source/tools/ctestfw
Modified Files:
Makefile.in ctest.c ctestfw.vcproj
Log Message:
ICU 2.8 sync
Index: Makefile.in
===================================================================
RCS file: /cvs/core/icu-sword/source/tools/ctestfw/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.in 10 Sep 2003 02:42:55 -0000 1.4
+++ Makefile.in 6 Apr 2004 10:09:58 -0000 1.5
@@ -20,7 +20,7 @@
## Target information
ifneq ($(ENABLE_STATIC),)
-TARGET = $(LIBICU)ctestfw$(ICULIBSUFFIX).a
+TARGET = $(LIBSICU)ctestfw$(ICULIBSUFFIX).a
endif
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
Index: ctest.c
===================================================================
RCS file: /cvs/core/icu-sword/source/tools/ctestfw/ctest.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ctest.c 10 Sep 2003 02:42:55 -0000 1.3
+++ ctest.c 6 Apr 2004 10:09:58 -0000 1.4
@@ -12,6 +12,8 @@
#include <assert.h>
#include <stdarg.h>
+#include "unicode/utrace.h"
+
/* NOTES:
3/20/1999 srl - strncpy called w/o setting nulls at the end
*/
@@ -69,7 +71,6 @@
* @param ap vprintf style arg list
*/
static void vlog_err(const char *prefix, const char *pattern, va_list ap);
-static void vlog_info(const char *prefix, const char *pattern, va_list ap);
static void vlog_verbose(const char *prefix, const char *pattern, va_list ap);
/* If we need to make the framework multi-thread safe
@@ -85,6 +86,7 @@
int ERR_MSG =1; /* error messages will be displayed by default*/
int QUICK = 1; /* Skip some of the slower tests? */
int WARN_ON_MISSING_DATA = 0; /* Reduce data errs to warnings? */
+UTraceLevel ICU_TRACE = UTRACE_OFF; /* ICU tracing level */
/*-------------------------------------------*/
/* strncmp that also makes sure there's a \0 at s2[0] */
@@ -427,7 +429,7 @@
va_end(ap);
}
-static void vlog_info(const char *prefix, const char *pattern, va_list ap)
+void vlog_info(const char *prefix, const char *pattern, va_list ap)
{
fprintf(stdout, "%-*s", INDENT_LEVEL," " );
if(prefix) {
@@ -580,7 +582,22 @@
{
subtreeOptionSeen=FALSE;
}
- else if (strcmp( argv[1], "-h" )==0 )
+ else if (strcmp( argv[i], "-t_info") == 0) {
+ ICU_TRACE = UTRACE_INFO;
+ }
+ else if (strcmp( argv[i], "-t_error") == 0) {
+ ICU_TRACE = UTRACE_ERROR;
+ }
+ else if (strcmp( argv[i], "-t_warn") == 0) {
+ ICU_TRACE = UTRACE_WARNING;
+ }
+ else if (strcmp( argv[i], "-t_verbose") == 0) {
+ ICU_TRACE = UTRACE_VERBOSE;
+ }
+ else if (strcmp( argv[i], "-t_oc") == 0) {
+ ICU_TRACE = UTRACE_OPEN_CLOSE;
+ }
+ else if (strcmp( argv[i], "-h" )==0 || strcmp( argv[i], "--help" )==0)
{
help( argv[0] );
return 0;
@@ -619,19 +636,22 @@
static void help ( const char *argv0 )
{
- printf("Usage: %s [ -l ] [ -v ] [ -verbose] [-a] [ -all] [-n] \n [ -no_err_msg] [ -h ] [ /path/to/test ]\n",
+ printf("Usage: %s [ -l ] [ -v ] [ -verbose] [-a] [ -all] [-n] [ -no_err_msg]\n"
+ " [ -h ] [-t_info | -t_error | -t_warn | -t_oc | -t_verbose]"
+ " [ /path/to/test ]\n",
argv0);
- printf(" -l To get a list of test names\n");
- printf(" -e to do exhaustive testing\n");
+ printf(" -l To get a list of test names\n");
+ printf(" -e to do exhaustive testing\n");
printf(" -verbose To turn ON verbosity\n");
- printf(" -v To turn ON verbosity(same as -verbose)\n");
- printf(" -h To print this message\n");
- printf(" -n To turn OFF printing error messages\n");
- printf(" -w Don't fail on data-loading errs, just warn. Useful if\n"
+ printf(" -v To turn ON verbosity(same as -verbose)\n");
+ printf(" -h To print this message\n");
+ printf(" -n To turn OFF printing error messages\n");
+ printf(" -w Don't fail on data-loading errs, just warn. Useful if\n"
" user has reduced/changed the common set of ICU data \n");
+ printf(" -t_info | -t_error | -t_warn | -t_oc | -t_verbose Enable ICU tracing\n");
printf(" -no_err_msg (same as -n) \n");
- printf(" -r repeat tests after calling u_cleanup \n");
- printf(" -[/subtest] To run a subtest \n");
+ printf(" -r repeat tests after calling u_cleanup \n");
+ printf(" -[/subtest] To run a subtest \n");
printf(" eg: to run just the utility tests type: cintltest /tsutil) \n");
}
Index: ctestfw.vcproj
===================================================================
RCS file: /cvs/core/icu-sword/source/tools/ctestfw/ctestfw.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ctestfw.vcproj 10 Sep 2003 02:42:55 -0000 1.1
+++ ctestfw.vcproj 6 Apr 2004 10:09:58 -0000 1.2
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.00"
+ Version="7.10"
Name="ctestfw"
SccProjectName=""
SccLocalPath="">
@@ -66,7 +66,13 @@
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -127,9 +133,17 @@
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
+ <References>
+ </References>
<Files>
<Filter
Name="Source Files"
@@ -143,22 +157,6 @@
Filter="h;hpp;hxx;hm;inl">
<File
RelativePath=".\unicode\ctest.h">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="copy $(InputPath) ..\..\..\include\unicode
-"
- Outputs="..\..\..\include\unicode\ctest.h"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="copy $(InputPath) ..\..\..\include\unicode
-"
- Outputs="..\..\..\include\unicode\ctest.h"/>
- </FileConfiguration>
</File>
</Filter>
<Filter
- Previous message: [sword-cvs] icu-sword/source/tools Makefile.in,1.4,1.5
- Next message: [sword-cvs] icu-sword/source/test/usetperf bitset.cpp,1.1,1.2 bitset.h,1.1,1.2 timer.h,1.1,1.2 usetperf.cpp,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]