From: Francesco Montorsi Date: Wed, 18 Mar 2009 15:32:28 +0000 (+0000) Subject: add a wxFont test unit (currently GetFamily and the Get/SetEncoding() bits are disabl... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5b06a80f9f806906c39e46e902f8c45b35d67d56 add a wxFont test unit (currently GetFamily and the Get/SetEncoding() bits are disabled because they fail on wxGTK -- need more investigation) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/tests/Makefile.in b/tests/Makefile.in index 179cdfb230..ec21de9638 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -14,6 +14,7 @@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ SETFILE = @SETFILE@ +ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@ BK_DEPS = @BK_DEPS@ BK_MAKE_PCH = @BK_MAKE_PCH@ srcdir = @srcdir@ @@ -132,6 +133,7 @@ TEST_GUI_OBJECTS = \ test_gui_textentrytest.o \ test_gui_treectrltest.o \ test_gui_propagation.o \ + test_gui_fonttest.o \ test_gui_rawbmp.o \ test_gui_htmlwindow.o \ test_gui_guifuncs.o \ @@ -169,7 +171,7 @@ PRINTFBENCH_ODEP = $(_____pch_testprec_printfbench_testprec_h_gch___depname) @COND_PLATFORM_MAC_1@__test___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL test$(EXEEXT) @COND_GCC_PCH_1@__test_PCH_INC = -I./.pch/testprec_test -@COND_ICC_PCH_1@__test_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__test_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/testprec_test/testprec.h.gch @COND_USE_PCH_1@_____pch_testprec_test_testprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/testprec_test/testprec.h.gch @@ -202,7 +204,7 @@ PRINTFBENCH_ODEP = $(_____pch_testprec_printfbench_testprec_h_gch___depname) @COND_TOOLKIT_COCOA@____test_gui_BUNDLE_TGT_REF_DEP = \ @COND_TOOLKIT_COCOA@ $(__test_gui_app_Contents_PkgInfo___depname) @COND_GCC_PCH_1@__test_gui_PCH_INC = -I./.pch/testprec_test_gui -@COND_ICC_PCH_1@__test_gui_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__test_gui_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/testprec_test_gui/testprec.h.gch @COND_USE_PCH_1@_____pch_testprec_test_gui_testprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/testprec_test_gui/testprec.h.gch @@ -234,7 +236,8 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ @COND_PLATFORM_MAC_1@__printfbench___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL printfbench$(EXEEXT) @COND_GCC_PCH_1@__printfbench_PCH_INC = -I./.pch/testprec_printfbench -@COND_ICC_PCH_1@__printfbench_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__printfbench_PCH_INC = \ +@COND_ICC_PCH_1@ $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/testprec_printfbench/testprec.h.gch @COND_USE_PCH_1@_____pch_testprec_printfbench_testprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/testprec_printfbench/testprec.h.gch @@ -573,6 +576,9 @@ test_gui_treectrltest.o: $(srcdir)/controls/treectrltest.cpp $(TEST_GUI_ODEP) test_gui_propagation.o: $(srcdir)/events/propagation.cpp $(TEST_GUI_ODEP) $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/events/propagation.cpp +test_gui_fonttest.o: $(srcdir)/font/fonttest.cpp $(TEST_GUI_ODEP) + $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/font/fonttest.cpp + test_gui_rawbmp.o: $(srcdir)/image/rawbmp.cpp $(TEST_GUI_ODEP) $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/image/rawbmp.cpp diff --git a/tests/font/fonttest.cpp b/tests/font/fonttest.cpp new file mode 100644 index 0000000000..b9893e7630 --- /dev/null +++ b/tests/font/fonttest.cpp @@ -0,0 +1,152 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: tests/font/fonttest.cpp +// Purpose: wxFont unit test +// Author: Francesco Montorsi +// Created: 16.3.09 +// RCS-ID: $Id$ +// Copyright: (c) 2009 Francesco Montorsi +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +#include "testprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#ifndef WX_PRECOMP + #include "wx/wx.h" +#endif // WX_PRECOMP + +#if wxUSE_FONTMAP + +#include "wx/font.h" + +// ---------------------------------------------------------------------------- +// test class +// ---------------------------------------------------------------------------- + +class FontTestCase : public CppUnit::TestCase +{ +public: + FontTestCase() { } + +private: + CPPUNIT_TEST_SUITE( FontTestCase ); + CPPUNIT_TEST( GetSet ); + CPPUNIT_TEST_SUITE_END(); + + void GetSet(); + + DECLARE_NO_COPY_CLASS(FontTestCase) +}; + +// register in the unnamed registry so that these tests are run by default +CPPUNIT_TEST_SUITE_REGISTRATION( FontTestCase ); + +// also include in it's own registry so that these tests can be run alone +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( FontTestCase, "FontTestCase" ); + + +void FontTestCase::GetSet() +{ + static const wxFont testfonts[] = + { + *wxNORMAL_FONT, + *wxSMALL_FONT, + *wxITALIC_FONT, + *wxSWISS_FONT, + wxFont(5, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL) + }; + + for ( size_t n = 0; n < WXSIZEOF(testfonts); n++ ) + { + wxFont test(testfonts[n]); + + // remember: getters can only be called when wxFont::IsOk() == true + CPPUNIT_ASSERT( test.IsOk() ); + + + // test Get/SetFaceName() + + const wxString& fn = test.GetFaceName(); + CPPUNIT_ASSERT( !fn.empty() ); + + CPPUNIT_ASSERT( !test.SetFaceName("a dummy face name") ); + CPPUNIT_ASSERT( !test.IsOk() ); + + CPPUNIT_ASSERT( test.SetFaceName(fn) ); + CPPUNIT_ASSERT( test.IsOk() ); + + + // test Get/SetFamily() + + test.SetFamily( wxFONTFAMILY_MODERN ); + //CPPUNIT_ASSERT_EQUAL( wxFONTFAMILY_MODERN, test.GetFamily() ); + + + // test Get/SetEncoding() + + //test.SetEncoding( wxFONTENCODING_KOI8 ); + //CPPUNIT_ASSERT_EQUAL( wxFONTENCODING_KOI8 , test.GetEncoding() ); + + + // test Get/SetNativeFontInfo + + const wxString& nid = test.GetNativeFontInfoDesc(); + CPPUNIT_ASSERT( !nid.empty() ); + + wxFont temp; + temp.SetNativeFontInfo(nid); + CPPUNIT_ASSERT( temp == test ); + + + // test Get/SetNativeFontInfoUserDesc + + const wxString& niud = test.GetNativeFontInfoUserDesc(); + CPPUNIT_ASSERT( !niud.empty() ); + + wxFont temp2; + temp2.SetNativeFontInfoUserDesc(niud); + CPPUNIT_ASSERT( temp2 == test ); + + + // test Get/SetPointSize() + + test.SetPointSize(30); + CPPUNIT_ASSERT_EQUAL( 30, test.GetPointSize() ); + + + // test Get/SetPixelSize() + + test.SetPixelSize(wxSize(0,30)); + CPPUNIT_ASSERT( test.GetPixelSize().GetHeight() <= 30 ); + // NOTE: the match found by SetPixelSize() may be not 100% precise; it + // only grants that a font smaller than the required height will + // be selected + + + // test Get/SetStyle() + + test.SetStyle(wxFONTSTYLE_SLANT); + CPPUNIT_ASSERT_EQUAL( wxFONTSTYLE_SLANT, test.GetStyle() ); + + + // test Get/SetUnderlined() + + test.SetUnderlined(true); + CPPUNIT_ASSERT_EQUAL( true, test.GetUnderlined() ); + + + // test Get/SetWeight() + + test.SetWeight(wxFONTWEIGHT_BOLD); + CPPUNIT_ASSERT_EQUAL( wxFONTWEIGHT_BOLD, test.GetWeight() ); + } +} + +#endif // wxUSE_FONTMAP diff --git a/tests/makefile.bcc b/tests/makefile.bcc index 84cbf38be4..71404d9c60 100644 --- a/tests/makefile.bcc +++ b/tests/makefile.bcc @@ -118,6 +118,7 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_textentrytest.obj \ $(OBJS)\test_gui_treectrltest.obj \ $(OBJS)\test_gui_propagation.obj \ + $(OBJS)\test_gui_fonttest.obj \ $(OBJS)\test_gui_rawbmp.obj \ $(OBJS)\test_gui_htmlwindow.obj \ $(OBJS)\test_gui_guifuncs.obj \ @@ -617,6 +618,9 @@ $(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp $(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp +$(OBJS)\test_gui_fonttest.obj: .\font\fonttest.cpp + $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\font\fonttest.cpp + $(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp diff --git a/tests/makefile.gcc b/tests/makefile.gcc index 78543f77e0..ccf07daafb 100644 --- a/tests/makefile.gcc +++ b/tests/makefile.gcc @@ -111,6 +111,7 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_textentrytest.o \ $(OBJS)\test_gui_treectrltest.o \ $(OBJS)\test_gui_propagation.o \ + $(OBJS)\test_gui_fonttest.o \ $(OBJS)\test_gui_rawbmp.o \ $(OBJS)\test_gui_htmlwindow.o \ $(OBJS)\test_gui_guifuncs.o \ @@ -597,6 +598,9 @@ $(OBJS)\test_gui_treectrltest.o: ./controls/treectrltest.cpp $(OBJS)\test_gui_propagation.o: ./events/propagation.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\test_gui_fonttest.o: ./font/fonttest.cpp + $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\test_gui_rawbmp.o: ./image/rawbmp.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< diff --git a/tests/makefile.vc b/tests/makefile.vc index 4c764edc00..50cbae5b07 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -114,6 +114,7 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_textentrytest.obj \ $(OBJS)\test_gui_treectrltest.obj \ $(OBJS)\test_gui_propagation.obj \ + $(OBJS)\test_gui_fonttest.obj \ $(OBJS)\test_gui_rawbmp.obj \ $(OBJS)\test_gui_htmlwindow.obj \ $(OBJS)\test_gui_guifuncs.obj \ @@ -702,6 +703,9 @@ $(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp $(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp +$(OBJS)\test_gui_fonttest.obj: .\font\fonttest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\font\fonttest.cpp + $(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp diff --git a/tests/makefile.wat b/tests/makefile.wat index c2df59bd00..1667a4bd65 100644 --- a/tests/makefile.wat +++ b/tests/makefile.wat @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif @@ -345,6 +349,7 @@ TEST_GUI_OBJECTS = & $(OBJS)\test_gui_textentrytest.obj & $(OBJS)\test_gui_treectrltest.obj & $(OBJS)\test_gui_propagation.obj & + $(OBJS)\test_gui_fonttest.obj & $(OBJS)\test_gui_rawbmp.obj & $(OBJS)\test_gui_htmlwindow.obj & $(OBJS)\test_gui_guifuncs.obj & @@ -654,6 +659,9 @@ $(OBJS)\test_gui_treectrltest.obj : .AUTODEPEND .\controls\treectrltest.cpp $(OBJS)\test_gui_propagation.obj : .AUTODEPEND .\events\propagation.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< +$(OBJS)\test_gui_fonttest.obj : .AUTODEPEND .\font\fonttest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + $(OBJS)\test_gui_rawbmp.obj : .AUTODEPEND .\image\rawbmp.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< diff --git a/tests/test.bkl b/tests/test.bkl index e5de212e0a..3cb355ce2b 100644 --- a/tests/test.bkl +++ b/tests/test.bkl @@ -115,6 +115,7 @@ controls/textentrytest.cpp controls/treectrltest.cpp events/propagation.cpp + font/fonttest.cpp image/rawbmp.cpp html/htmlwindow.cpp misc/guifuncs.cpp diff --git a/tests/test_test_gui.dsp b/tests/test_test_gui.dsp index 28eb179fe3..3596361d32 100644 --- a/tests/test_test_gui.dsp +++ b/tests/test_test_gui.dsp @@ -253,6 +253,10 @@ SOURCE=.\dummy.cpp # End Source File # Begin Source File +SOURCE=.\font\fonttest.cpp +# End Source File +# Begin Source File + SOURCE=.\misc\garbage.cpp # End Source File # Begin Source File diff --git a/tests/test_vc7_printfbench.vcproj b/tests/test_vc7_printfbench.vcproj index ca4442cb31..e924b9de65 100644 --- a/tests/test_vc7_printfbench.vcproj +++ b/tests/test_vc7_printfbench.vcproj @@ -17,27 +17,29 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/> + Name="Debug|Win32"> + Name="Release|Win32"> + Name="Universal Debug|Win32"> + Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Universal Release|Win32"> diff --git a/tests/test_vc7_test.vcproj b/tests/test_vc7_test.vcproj index aa0bfc57a5..17c607c6d4 100644 --- a/tests/test_vc7_test.vcproj +++ b/tests/test_vc7_test.vcproj @@ -17,27 +17,29 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/> + Name="Debug|Win32"> + Name="Release|Win32"> + Name="Universal Debug|Win32"> + Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Universal Release|Win32"> diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj index ea1232cfab..f07e10727e 100644 --- a/tests/test_vc7_test_gui.vcproj +++ b/tests/test_vc7_test_gui.vcproj @@ -17,27 +17,29 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;NOPCH;_CONSOLE" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"/> + Name="Debug|Win32"> + Name="Release|Win32"> + Name="Universal Debug|Win32"> + Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Universal Release|Win32"> + + @@ -666,7 +677,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\samples\sample.rc"> diff --git a/tests/test_vc8_printfbench.vcproj b/tests/test_vc8_printfbench.vcproj index c74a8c5852..e180c7f2c1 100644 --- a/tests/test_vc8_printfbench.vcproj +++ b/tests/test_vc8_printfbench.vcproj @@ -22,9 +22,9 @@ @@ -101,7 +105,7 @@ /> @@ -200,7 +202,7 @@ /> @@ -296,7 +302,7 @@ /> @@ -395,7 +399,7 @@ /> @@ -491,7 +499,7 @@ /> @@ -590,7 +596,7 @@ /> @@ -686,7 +696,7 @@ /> @@ -785,7 +793,7 @@ /> @@ -101,7 +105,7 @@ /> @@ -200,7 +202,7 @@ /> @@ -296,7 +302,7 @@ /> @@ -395,7 +399,7 @@ /> @@ -491,7 +499,7 @@ /> @@ -590,7 +596,7 @@ /> @@ -686,7 +696,7 @@ /> @@ -785,7 +793,7 @@ /> @@ -101,7 +105,7 @@ /> @@ -200,7 +202,7 @@ /> @@ -296,7 +302,7 @@ /> @@ -395,7 +399,7 @@ /> @@ -491,7 +499,7 @@ /> @@ -590,7 +596,7 @@ /> @@ -686,7 +696,7 @@ /> @@ -785,7 +793,7 @@ /> + + @@ -966,7 +978,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > diff --git a/tests/test_vc9.sln b/tests/test_vc9.sln index 9e08286566..d4163d3616 100644 --- a/tests/test_vc9.sln +++ b/tests/test_vc9.sln @@ -8,64 +8,64 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "printfbench", "test_vc9_pri EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - DLL Universal Release|Win32 = DLL Universal Release|Win32 - DLL Universal Debug|Win32 = DLL Universal Debug|Win32 - DLL Release|Win32 = DLL Release|Win32 - DLL Debug|Win32 = DLL Debug|Win32 - Universal Release|Win32 = Universal Release|Win32 - Universal Debug|Win32 = Universal Debug|Win32 - Release|Win32 = Release|Win32 Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + Universal Debug|Win32 = Universal Debug|Win32 + Universal Release|Win32 = Universal Release|Win32 + DLL Debug|Win32 = DLL Debug|Win32 + DLL Release|Win32 = DLL Release|Win32 + DLL Universal Debug|Win32 = DLL Universal Debug|Win32 + DLL Universal Release|Win32 = DLL Universal Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Release|Win32.ActiveCfg = Release|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Release|Win32.Build.0 = Release|Win32 {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Debug|Win32.ActiveCfg = Debug|Win32 {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Debug|Win32.Build.0 = Debug|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.ActiveCfg = Release|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.Build.0 = Release|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Release|Win32.ActiveCfg = Release|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Release|Win32.Build.0 = Release|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.ActiveCfg = Debug|Win32 {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.Build.0 = Debug|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Release|Win32.ActiveCfg = Release|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Release|Win32.Build.0 = Release|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.ActiveCfg = Release|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.Build.0 = Release|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Debug|Win32.ActiveCfg = Debug|Win32 {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Debug|Win32.Build.0 = Debug|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Release|Win32.ActiveCfg = Release|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Release|Win32.Build.0 = Release|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/tests/test_vc9_printfbench.vcproj b/tests/test_vc9_printfbench.vcproj index f076ccfca9..292019552d 100644 --- a/tests/test_vc9_printfbench.vcproj +++ b/tests/test_vc9_printfbench.vcproj @@ -22,9 +22,9 @@ @@ -101,7 +104,7 @@ /> @@ -196,7 +198,7 @@ /> @@ -289,7 +294,7 @@ /> @@ -384,7 +388,7 @@ /> @@ -477,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +674,7 @@ /> @@ -760,7 +768,7 @@ /> @@ -101,7 +104,7 @@ /> @@ -196,7 +198,7 @@ /> @@ -289,7 +294,7 @@ /> @@ -384,7 +388,7 @@ /> @@ -477,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +674,7 @@ /> @@ -760,7 +768,7 @@ /> @@ -101,7 +104,7 @@ /> @@ -196,7 +198,7 @@ /> @@ -289,7 +294,7 @@ /> @@ -384,7 +388,7 @@ /> @@ -477,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +674,7 @@ /> @@ -760,7 +768,7 @@ /> + + @@ -938,7 +950,7 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" >