Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update msvc projs manually for changed tests and uri tests and rebake others

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2004-11-08 00:17:00 +00:00
parent 2456792140
commit 113e181a8a
8 changed files with 243 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
tests/Makefile.in
View File

@@ -41,17 +41,17 @@ TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
TEST_OBJECTS = \ TEST_OBJECTS = \
test_test.o \ test_test.o \
test_arrays.o \ test_arrays.o \
test_datetime.o \ test_datetimetest.o \
test_fileconf.o \ test_fileconftest.o \
test_filename.o \ test_filenametest.o \
test_filesys.o \ test_filesystest.o \
test_fontmap.o \ test_fontmaptest.o \
test_formatconverter.o \ test_formatconvertertest.o \
test_hashes.o \ test_hashes.o \
test_longlong.o \ test_longlongtest.o \
test_main.o \ test_mbconvtest.o \
test_regex.o \ test_regextest.o \
test_wxregex.o \ test_wxregextest.o \
test_strings.o \ test_strings.o \
test_stdstrings.o \ test_stdstrings.o \
test_unicode.o \ test_unicode.o \
@@ -81,6 +81,9 @@ TEST_OBJECTS = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL test$(EXEEXT) @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL test$(EXEEXT)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
COND_MONOLITHIC_0___WXLIB_NET_p = \
-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p)
COND_MONOLITHIC_0___WXLIB_BASE_p = \ COND_MONOLITHIC_0___WXLIB_BASE_p = \
-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
@@ -125,7 +128,7 @@ distclean: clean
rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
test$(EXEEXT): $(TEST_OBJECTS) test$(EXEEXT): $(TEST_OBJECTS)
$(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
$(__test___mac_setfilecmd) $(__test___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK) $(SAMPLES_RPATH_POSTLINK)
@@ -144,37 +147,37 @@ test_test.o: $(srcdir)/test.cpp
test_arrays.o: $(srcdir)/arrays/arrays.cpp test_arrays.o: $(srcdir)/arrays/arrays.cpp
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
test_datetime.o: $(srcdir)/datetime/datetime.cpp test_datetimetest.o: $(srcdir)/datetime/datetimetest.cpp
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
test_fileconf.o: $(srcdir)/fileconf/fileconf.cpp test_fileconftest.o: $(srcdir)/fileconf/fileconftest.cpp
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
test_filename.o: $(srcdir)/filename/filename.cpp test_filenametest.o: $(srcdir)/filename/filenametest.cpp
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
test_filesys.o: $(srcdir)/filesys/filesys.cpp test_filesystest.o: $(srcdir)/filesys/filesystest.cpp
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
test_fontmap.o: $(srcdir)/fontmap/fontmap.cpp test_fontmaptest.o: $(srcdir)/fontmap/fontmaptest.cpp
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
test_formatconverter.o: $(srcdir)/formatconverter/formatconverter.cpp test_formatconvertertest.o: $(srcdir)/formatconverter/formatconvertertest.cpp
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
test_hashes.o: $(srcdir)/hashes/hashes.cpp test_hashes.o: $(srcdir)/hashes/hashes.cpp
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
test_longlong.o: $(srcdir)/longlong/longlong.cpp test_longlongtest.o: $(srcdir)/longlong/longlongtest.cpp
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
test_main.o: $(srcdir)/mbconv/main.cpp test_mbconvtest.o: $(srcdir)/mbconv/mbconvtest.cpp
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
test_regex.o: $(srcdir)/regex/regex.cpp test_regextest.o: $(srcdir)/regex/regextest.cpp
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
test_wxregex.o: $(srcdir)/regex/wxregex.cpp test_wxregextest.o: $(srcdir)/regex/wxregextest.cpp
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
test_strings.o: $(srcdir)/strings/strings.cpp test_strings.o: $(srcdir)/strings/strings.cpp

46
tests/makefile.bcc
View File

@@ -33,17 +33,17 @@ TEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \
TEST_OBJECTS = \ TEST_OBJECTS = \
$(OBJS)\test_test.obj \ $(OBJS)\test_test.obj \
$(OBJS)\test_arrays.obj \ $(OBJS)\test_arrays.obj \
$(OBJS)\test_datetime.obj \ $(OBJS)\test_datetimetest.obj \
$(OBJS)\test_fileconf.obj \ $(OBJS)\test_fileconftest.obj \
$(OBJS)\test_filename.obj \ $(OBJS)\test_filenametest.obj \
$(OBJS)\test_filesys.obj \ $(OBJS)\test_filesystest.obj \
$(OBJS)\test_fontmap.obj \ $(OBJS)\test_fontmaptest.obj \
$(OBJS)\test_formatconverter.obj \ $(OBJS)\test_formatconvertertest.obj \
$(OBJS)\test_hashes.obj \ $(OBJS)\test_hashes.obj \
$(OBJS)\test_longlong.obj \ $(OBJS)\test_longlongtest.obj \
$(OBJS)\test_main.obj \ $(OBJS)\test_mbconvtest.obj \
$(OBJS)\test_regex.obj \ $(OBJS)\test_regextest.obj \
$(OBJS)\test_wxregex.obj \ $(OBJS)\test_wxregextest.obj \
$(OBJS)\test_strings.obj \ $(OBJS)\test_strings.obj \
$(OBJS)\test_stdstrings.obj \ $(OBJS)\test_stdstrings.obj \
$(OBJS)\test_unicode.obj \ $(OBJS)\test_unicode.obj \
@@ -119,6 +119,10 @@ __UNICODE_DEFINE_p = -D_UNICODE
__DLLFLAG_p = -DWXUSINGDLL __DLLFLAG_p = -DWXUSINGDLL
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_NET_p = \
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
@@ -178,7 +182,7 @@ clean:
$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test.exe: $(TEST_OBJECTS)
ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) @&&| ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) @&&|
c0x32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, c0x32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
| |
data: data:
@@ -191,37 +195,37 @@ $(OBJS)\test_test.obj: .\test.cpp
$(OBJS)\test_arrays.obj: .\arrays\arrays.cpp $(OBJS)\test_arrays.obj: .\arrays\arrays.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_datetime.obj: .\datetime\datetime.cpp $(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_fileconf.obj: .\fileconf\fileconf.cpp $(OBJS)\test_fileconftest.obj: .\fileconf\fileconftest.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_filename.obj: .\filename\filename.cpp $(OBJS)\test_filenametest.obj: .\filename\filenametest.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_filesys.obj: .\filesys\filesys.cpp $(OBJS)\test_filesystest.obj: .\filesys\filesystest.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_fontmap.obj: .\fontmap\fontmap.cpp $(OBJS)\test_fontmaptest.obj: .\fontmap\fontmaptest.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_formatconverter.obj: .\formatconverter\formatconverter.cpp $(OBJS)\test_formatconvertertest.obj: .\formatconverter\formatconvertertest.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_hashes.obj: .\hashes\hashes.cpp $(OBJS)\test_hashes.obj: .\hashes\hashes.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_longlong.obj: .\longlong\longlong.cpp $(OBJS)\test_longlongtest.obj: .\longlong\longlongtest.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_main.obj: .\mbconv\main.cpp $(OBJS)\test_mbconvtest.obj: .\mbconv\mbconvtest.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_regex.obj: .\regex\regex.cpp $(OBJS)\test_regextest.obj: .\regex\regextest.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_wxregex.obj: .\regex\wxregex.cpp $(OBJS)\test_wxregextest.obj: .\regex\wxregextest.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_strings.obj: .\strings\strings.cpp $(OBJS)\test_strings.obj: .\strings\strings.cpp

46
tests/makefile.gcc
View File

@@ -24,17 +24,17 @@ TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \
TEST_OBJECTS = \ TEST_OBJECTS = \
$(OBJS)\test_test.o \ $(OBJS)\test_test.o \
$(OBJS)\test_arrays.o \ $(OBJS)\test_arrays.o \
$(OBJS)\test_datetime.o \ $(OBJS)\test_datetimetest.o \
$(OBJS)\test_fileconf.o \ $(OBJS)\test_fileconftest.o \
$(OBJS)\test_filename.o \ $(OBJS)\test_filenametest.o \
$(OBJS)\test_filesys.o \ $(OBJS)\test_filesystest.o \
$(OBJS)\test_fontmap.o \ $(OBJS)\test_fontmaptest.o \
$(OBJS)\test_formatconverter.o \ $(OBJS)\test_formatconvertertest.o \
$(OBJS)\test_hashes.o \ $(OBJS)\test_hashes.o \
$(OBJS)\test_longlong.o \ $(OBJS)\test_longlongtest.o \
$(OBJS)\test_main.o \ $(OBJS)\test_mbconvtest.o \
$(OBJS)\test_regex.o \ $(OBJS)\test_regextest.o \
$(OBJS)\test_wxregex.o \ $(OBJS)\test_wxregextest.o \
$(OBJS)\test_strings.o \ $(OBJS)\test_strings.o \
$(OBJS)\test_stdstrings.o \ $(OBJS)\test_stdstrings.o \
$(OBJS)\test_unicode.o \ $(OBJS)\test_unicode.o \
@@ -117,6 +117,10 @@ ifeq ($(SHARED),1)
__DLLFLAG_p = -DWXUSINGDLL __DLLFLAG_p = -DWXUSINGDLL
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_NET_p = \
-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif endif
@@ -173,7 +177,7 @@ clean:
-if exist $(OBJS)\test.exe del $(OBJS)\test.exe -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test.exe: $(TEST_OBJECTS)
$(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
data: data:
if not exist $(OBJS) mkdir $(OBJS) if not exist $(OBJS) mkdir $(OBJS)
@@ -185,37 +189,37 @@ $(OBJS)\test_test.o: ./test.cpp
$(OBJS)\test_arrays.o: ./arrays/arrays.cpp $(OBJS)\test_arrays.o: ./arrays/arrays.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $< $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_datetime.o: ./datetime/datetime.cpp $(OBJS)\test_datetimetest.o: ./datetime/datetimetest.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $< $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_fileconf.o: ./fileconf/fileconf.cpp $(OBJS)\test_fileconftest.o: ./fileconf/fileconftest.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $< $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_filename.o: ./filename/filename.cpp $(OBJS)\test_filenametest.o: ./filename/filenametest.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $< $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_filesys.o: ./filesys/filesys.cpp $(OBJS)\test_filesystest.o: ./filesys/filesystest.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $< $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_fontmap.o: ./fontmap/fontmap.cpp $(OBJS)\test_fontmaptest.o: ./fontmap/fontmaptest.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $< $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_formatconverter.o: ./formatconverter/formatconverter.cpp $(OBJS)\test_formatconvertertest.o: ./formatconverter/formatconvertertest.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $< $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_hashes.o: ./hashes/hashes.cpp $(OBJS)\test_hashes.o: ./hashes/hashes.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $< $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_longlong.o: ./longlong/longlong.cpp $(OBJS)\test_longlongtest.o: ./longlong/longlongtest.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $< $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_main.o: ./mbconv/main.cpp $(OBJS)\test_mbconvtest.o: ./mbconv/mbconvtest.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $< $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_regex.o: ./regex/regex.cpp $(OBJS)\test_regextest.o: ./regex/regextest.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $< $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_wxregex.o: ./regex/wxregex.cpp $(OBJS)\test_wxregextest.o: ./regex/wxregextest.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $< $(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_strings.o: ./strings/strings.cpp $(OBJS)\test_strings.o: ./strings/strings.cpp

46
tests/makefile.vc
View File

@@ -26,17 +26,17 @@ TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
TEST_OBJECTS = \ TEST_OBJECTS = \
$(OBJS)\test_test.obj \ $(OBJS)\test_test.obj \
$(OBJS)\test_arrays.obj \ $(OBJS)\test_arrays.obj \
$(OBJS)\test_datetime.obj \ $(OBJS)\test_datetimetest.obj \
$(OBJS)\test_fileconf.obj \ $(OBJS)\test_fileconftest.obj \
$(OBJS)\test_filename.obj \ $(OBJS)\test_filenametest.obj \
$(OBJS)\test_filesys.obj \ $(OBJS)\test_filesystest.obj \
$(OBJS)\test_fontmap.obj \ $(OBJS)\test_fontmaptest.obj \
$(OBJS)\test_formatconverter.obj \ $(OBJS)\test_formatconvertertest.obj \
$(OBJS)\test_hashes.obj \ $(OBJS)\test_hashes.obj \
$(OBJS)\test_longlong.obj \ $(OBJS)\test_longlongtest.obj \
$(OBJS)\test_main.obj \ $(OBJS)\test_mbconvtest.obj \
$(OBJS)\test_regex.obj \ $(OBJS)\test_regextest.obj \
$(OBJS)\test_wxregex.obj \ $(OBJS)\test_wxregextest.obj \
$(OBJS)\test_strings.obj \ $(OBJS)\test_strings.obj \
$(OBJS)\test_stdstrings.obj \ $(OBJS)\test_stdstrings.obj \
$(OBJS)\test_unicode.obj \ $(OBJS)\test_unicode.obj \
@@ -190,6 +190,10 @@ __UNICODE_DEFINE_p = /D_UNICODE
__DLLFLAG_p = /DWXUSINGDLL __DLLFLAG_p = /DWXUSINGDLL
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_NET_p = \
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif !endif
@@ -234,7 +238,7 @@ clean:
$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test.exe: $(TEST_OBJECTS)
link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) @<< link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) @<<
$(TEST_OBJECTS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(TEST_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib
<< <<
data: data:
@@ -247,37 +251,37 @@ $(OBJS)\test_test.obj: .\test.cpp
$(OBJS)\test_arrays.obj: .\arrays\arrays.cpp $(OBJS)\test_arrays.obj: .\arrays\arrays.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_datetime.obj: .\datetime\datetime.cpp $(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_fileconf.obj: .\fileconf\fileconf.cpp $(OBJS)\test_fileconftest.obj: .\fileconf\fileconftest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_filename.obj: .\filename\filename.cpp $(OBJS)\test_filenametest.obj: .\filename\filenametest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_filesys.obj: .\filesys\filesys.cpp $(OBJS)\test_filesystest.obj: .\filesys\filesystest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_fontmap.obj: .\fontmap\fontmap.cpp $(OBJS)\test_fontmaptest.obj: .\fontmap\fontmaptest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_formatconverter.obj: .\formatconverter\formatconverter.cpp $(OBJS)\test_formatconvertertest.obj: .\formatconverter\formatconvertertest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_hashes.obj: .\hashes\hashes.cpp $(OBJS)\test_hashes.obj: .\hashes\hashes.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_longlong.obj: .\longlong\longlong.cpp $(OBJS)\test_longlongtest.obj: .\longlong\longlongtest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_main.obj: .\mbconv\main.cpp $(OBJS)\test_mbconvtest.obj: .\mbconv\mbconvtest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_regex.obj: .\regex\regex.cpp $(OBJS)\test_regextest.obj: .\regex\regextest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_wxregex.obj: .\regex\wxregex.cpp $(OBJS)\test_wxregextest.obj: .\regex\wxregextest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
$(OBJS)\test_strings.obj: .\strings\strings.cpp $(OBJS)\test_strings.obj: .\strings\strings.cpp

47
tests/makefile.wat
View File

@@ -138,6 +138,11 @@ __DLLFLAG_p =
!ifeq SHARED 1 !ifeq SHARED 1
__DLLFLAG_p = -dWXUSINGDLL __DLLFLAG_p = -dWXUSINGDLL
!endif !endif
__WXLIB_NET_p =
!ifeq MONOLITHIC 0
__WXLIB_NET_p = &
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
!endif
__WXLIB_BASE_p = __WXLIB_BASE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_BASE_p = & __WXLIB_BASE_p = &
@@ -182,17 +187,17 @@ TEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) &
TEST_OBJECTS = & TEST_OBJECTS = &
$(OBJS)\test_test.obj & $(OBJS)\test_test.obj &
$(OBJS)\test_arrays.obj & $(OBJS)\test_arrays.obj &
$(OBJS)\test_datetime.obj & $(OBJS)\test_datetimetest.obj &
$(OBJS)\test_fileconf.obj & $(OBJS)\test_fileconftest.obj &
$(OBJS)\test_filename.obj & $(OBJS)\test_filenametest.obj &
$(OBJS)\test_filesys.obj & $(OBJS)\test_filesystest.obj &
$(OBJS)\test_fontmap.obj & $(OBJS)\test_fontmaptest.obj &
$(OBJS)\test_formatconverter.obj & $(OBJS)\test_formatconvertertest.obj &
$(OBJS)\test_hashes.obj & $(OBJS)\test_hashes.obj &
$(OBJS)\test_longlong.obj & $(OBJS)\test_longlongtest.obj &
$(OBJS)\test_main.obj & $(OBJS)\test_mbconvtest.obj &
$(OBJS)\test_regex.obj & $(OBJS)\test_regextest.obj &
$(OBJS)\test_wxregex.obj & $(OBJS)\test_wxregextest.obj &
$(OBJS)\test_strings.obj & $(OBJS)\test_strings.obj &
$(OBJS)\test_stdstrings.obj & $(OBJS)\test_stdstrings.obj &
$(OBJS)\test_unicode.obj & $(OBJS)\test_unicode.obj &
@@ -228,7 +233,7 @@ $(OBJS)\test.exe : $(TEST_OBJECTS)
@%append $(OBJS)\test.lbc option caseexact @%append $(OBJS)\test.lbc option caseexact
@%append $(OBJS)\test.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS) @%append $(OBJS)\test.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS)
@for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i
@for %i in ( $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\test.lbc library %i @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\test.lbc library %i
@%append $(OBJS)\test.lbc @%append $(OBJS)\test.lbc
wlink @$(OBJS)\test.lbc wlink @$(OBJS)\test.lbc
@@ -242,37 +247,37 @@ $(OBJS)\test_test.obj : .AUTODEPEND .\test.cpp
$(OBJS)\test_arrays.obj : .AUTODEPEND .\arrays\arrays.cpp $(OBJS)\test_arrays.obj : .AUTODEPEND .\arrays\arrays.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_datetime.obj : .AUTODEPEND .\datetime\datetime.cpp $(OBJS)\test_datetimetest.obj : .AUTODEPEND .\datetime\datetimetest.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_fileconf.obj : .AUTODEPEND .\fileconf\fileconf.cpp $(OBJS)\test_fileconftest.obj : .AUTODEPEND .\fileconf\fileconftest.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_filename.obj : .AUTODEPEND .\filename\filename.cpp $(OBJS)\test_filenametest.obj : .AUTODEPEND .\filename\filenametest.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_filesys.obj : .AUTODEPEND .\filesys\filesys.cpp $(OBJS)\test_filesystest.obj : .AUTODEPEND .\filesys\filesystest.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_fontmap.obj : .AUTODEPEND .\fontmap\fontmap.cpp $(OBJS)\test_fontmaptest.obj : .AUTODEPEND .\fontmap\fontmaptest.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_formatconverter.obj : .AUTODEPEND .\formatconverter\formatconverter.cpp $(OBJS)\test_formatconvertertest.obj : .AUTODEPEND .\formatconverter\formatconvertertest.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_hashes.obj : .AUTODEPEND .\hashes\hashes.cpp $(OBJS)\test_hashes.obj : .AUTODEPEND .\hashes\hashes.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_longlong.obj : .AUTODEPEND .\longlong\longlong.cpp $(OBJS)\test_longlongtest.obj : .AUTODEPEND .\longlong\longlongtest.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_main.obj : .AUTODEPEND .\mbconv\main.cpp $(OBJS)\test_mbconvtest.obj : .AUTODEPEND .\mbconv\mbconvtest.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_regex.obj : .AUTODEPEND .\regex\regex.cpp $(OBJS)\test_regextest.obj : .AUTODEPEND .\regex\regextest.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_wxregex.obj : .AUTODEPEND .\regex\wxregex.cpp $(OBJS)\test_wxregextest.obj : .AUTODEPEND .\regex\wxregextest.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_strings.obj : .AUTODEPEND .\strings\strings.cpp $(OBJS)\test_strings.obj : .AUTODEPEND .\strings\strings.cpp

95
tests/test.dsp
View File

@@ -398,7 +398,6 @@ LINK32=link.exe
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "vc_mswd" # PROP Output_Dir "vc_mswd"
# PROP Intermediate_Dir "vc_mswd\test" # PROP Intermediate_Dir "vc_mswd\test"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I ".\..\include" /I ".\..\lib\vc_lib\mswd" /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_CONSOLE" /Fd"vc_mswd\test.pdb" /FD /GZ /c # ADD BASE CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I ".\..\include" /I ".\..\lib\vc_lib\mswd" /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_CONSOLE" /Fd"vc_mswd\test.pdb" /FD /GZ /c
# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I ".\..\include" /I ".\..\lib\vc_lib\mswd" /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_CONSOLE" /Fd"vc_mswd\test.pdb" /FD /GZ /c # ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I ".\..\include" /I ".\..\lib\vc_lib\mswd" /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_CONSOLE" /Fd"vc_mswd\test.pdb" /FD /GZ /c
@@ -409,7 +408,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:".\..\lib\vc_lib" # ADD BASE LINK32 wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:".\..\lib\vc_lib"
# ADD LINK32 wxbase25d.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:".\..\lib\vc_lib" # ADD LINK32 wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:".\..\lib\vc_lib"
!ENDIF !ENDIF
@@ -436,12 +435,104 @@ LINK32=link.exe
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Source File # Begin Source File
SOURCE=.\arrays\arrays.cpp
# End Source File
# Begin Source File
SOURCE=.\streams\bstream.cpp
# End Source File
# Begin Source File
SOURCE=.\streams\bstream.h
# End Source File
# Begin Source File
SOURCE=.\strings\crt.cpp
# End Source File
# Begin Source File
SOURCE=.\datetime\datetimetest.cpp
# End Source File
# Begin Source File
SOURCE=.\streams\ffilestream.cpp
# End Source File
# Begin Source File
SOURCE=.\fileconf\fileconftest.cpp
# End Source File
# Begin Source File
SOURCE=.\filename\filenametest.cpp
# End Source File
# Begin Source File
SOURCE=.\streams\filestream.cpp
# End Source File
# Begin Source File
SOURCE=.\filesys\filesystest.cpp
# End Source File
# Begin Source File
SOURCE=.\fontmap\fontmaptest.cpp
# End Source File
# Begin Source File
SOURCE=.\formatconverter\formatconvertertest.cpp
# End Source File
# Begin Source File
SOURCE=.\hashes\hashes.cpp
# End Source File
# Begin Source File
SOURCE=.\longlong\longlongtest.cpp
# End Source File
# Begin Source File
SOURCE=.\mbconv\mbconvtest.cpp
# End Source File
# Begin Source File
SOURCE=.\streams\memstream.cpp
# End Source File
# Begin Source File
SOURCE=.\regex\regextest.cpp
# End Source File
# Begin Source File
SOURCE=.\streams\sstream.cpp
# End Source File
# Begin Source File
SOURCE=.\strings\stdstrings.cpp
# End Source File
# Begin Source File
SOURCE=.\strings\strings.cpp
# End Source File
# Begin Source File
SOURCE=.\test.cpp SOURCE=.\test.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\strings\unicode.cpp
# End Source File
# Begin Source File
SOURCE=.\uris\uris.cpp SOURCE=.\uris\uris.cpp
# End Source File # End Source File
# Begin Source File
SOURCE=.\regex\wxregextest.cpp
# End Source File
# Begin Source File
SOURCE=.\streams\zlibstream.cpp
# End Source File
# End Group # End Group
# End Target # End Target
# End Project # End Project

65
tests/test.dsw
View File

@@ -1,6 +1,20 @@
Microsoft Developer Studio Workspace File, Format Version 6.00 Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "test"=test.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name base
End Project Dependency
}}}
############################################################################### ###############################################################################
Project: "base"=..\build\msw\wx_base.dsp - Package Owner=<4> Project: "base"=..\build\msw\wx_base.dsp - Package Owner=<4>
@@ -15,54 +29,3 @@ Package=<4>
############################################################################### ###############################################################################
Project: "console"=..\samples\console\console.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "net"=..\build\msw\wx_net.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "test"=.\test.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name base
End Project Dependency
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################

12
tests/uris/uris.cpp
View File

@@ -27,7 +27,7 @@
#include "wx/cppunit.h" #include "wx/cppunit.h"
// Test wxURL & wxURI compat? // Test wxURL & wxURI compat?
#define TEST_URL ( 1 && wxUSE_URL ) #define TEST_URL ( 0 && wxUSE_URL )
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// test class // test class
@@ -279,6 +279,7 @@ void URITestCase::Comparison()
#if TEST_URL #if TEST_URL
#include "wx/url.h" #include "wx/url.h"
#include "wx/mimetype.h"
void URITestCase::URLCompat() void URITestCase::URLCompat()
{ {
@@ -309,6 +310,15 @@ void URITestCase::URLCompat()
#if WXWIN_COMPATIBILITY_2_4 #if WXWIN_COMPATIBILITY_2_4
CPPUNIT_ASSERT( wxURL::ConvertFromURI(wxT("%20%41%20")) == wxT(" A ") ); CPPUNIT_ASSERT( wxURL::ConvertFromURI(wxT("%20%41%20")) == wxT(" A ") );
#endif #endif
CPPUNIT_ASSERT( wxURI::Unescape(wxT("%20%41%20")) == wxT(" A ") );
wxURI test(wxT("file:\"myf\"ile.txt"));
CPPUNIT_ASSERT( test.BuildURI() == wxT("file:%22myf%22ile.txt") );
CPPUNIT_ASSERT( test.GetScheme() == wxT("file") );
CPPUNIT_ASSERT( test.GetPath() == wxT("%22myf%22ile.txt") );
// CPPUNIT_ASSERT( wxURI::Unescape(wxT("%22myf%22ile.txt")) );
wxPrintf(wxURI::Unescape(wxT("%22myf%22ile.txt")) );
} }
#endif #endif