From 031b101f099711eab5d9eb4893b8748bfa81743d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 22 Mar 2009 21:31:34 +0000 Subject: [PATCH] moved the check for correct implementation of wxEvent::Clone() to a unit test from wx startup code git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/init.cpp | 38 ---- tests/Makefile.in | 12 +- tests/events/clone.cpp | 80 +++++++ tests/makefile.bcc | 4 + tests/makefile.gcc | 4 + tests/makefile.vc | 4 + tests/makefile.wat | 8 +- tests/test.bkl | 1 + tests/test_test_gui.dsp | 4 + tests/test_vc7_printfbench.vcproj | 336 ++++++++++++++--------------- tests/test_vc7_test.vcproj | 336 ++++++++++++++--------------- tests/test_vc7_test_gui.vcproj | 341 +++++++++++++++-------------- tests/test_vc8_printfbench.vcproj | 336 ++++++++++++++--------------- tests/test_vc8_test.vcproj | 336 ++++++++++++++--------------- tests/test_vc8_test_gui.vcproj | 342 +++++++++++++++--------------- tests/test_vc9.sln | 98 ++++----- tests/test_vc9_printfbench.vcproj | 328 ++++++++++++++-------------- tests/test_vc9_test.vcproj | 328 ++++++++++++++-------------- tests/test_vc9_test_gui.vcproj | 334 ++++++++++++++--------------- 19 files changed, 1635 insertions(+), 1635 deletions(-) create mode 100644 tests/events/clone.cpp diff --git a/src/common/init.cpp b/src/common/init.cpp index a183c256f2..6e9f06fad8 100644 --- a/src/common/init.cpp +++ b/src/common/init.cpp @@ -252,44 +252,6 @@ static bool DoCommonPostInit() return false; } -#if defined(__WXDEBUG__) - // check if event classes implement Clone() correctly - // NOTE: the check is done against _all_ event classes which are linked to - // the executable currently running, which are not necessarily all - // wxWidgets event classes. - const wxClassInfo *ci = wxClassInfo::GetFirst(); - for (; ci; ci = ci->GetNext()) - { - // is this class derived from wxEvent? - if (!ci->IsKindOf(CLASSINFO(wxEvent)) || wxString(ci->GetClassName()) == "wxEvent") - continue; - - if (!ci->IsDynamic()) - { - wxLogWarning("The event class '%s' should have a DECLARE_DYNAMIC_CLASS macro!", - ci->GetClassName()); - continue; - } - - // yes; test if it implements Clone() correctly - wxEvent* test = wxDynamicCast(ci->CreateObject(),wxEvent); - if (test == NULL) - { - wxLogWarning("The event class '%s' should have a DECLARE_DYNAMIC_CLASS macro!", - ci->GetClassName()); - continue; - } - - wxEvent* cloned = test->Clone(); - if (!cloned || cloned->GetClassInfo() != ci) - wxLogWarning("The event class '%s' does not correctly implement Clone()!", - ci->GetClassName()); - - delete cloned; - delete test; - } -#endif - return true; } diff --git a/tests/Makefile.in b/tests/Makefile.in index ec21de9638..dc430291e1 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -14,7 +14,6 @@ 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 +131,7 @@ TEST_GUI_OBJECTS = \ test_gui_textctrltest.o \ test_gui_textentrytest.o \ test_gui_treectrltest.o \ + test_gui_clone.o \ test_gui_propagation.o \ test_gui_fonttest.o \ test_gui_rawbmp.o \ @@ -171,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 = $(ICC_PCH_USE_SWITCH) \ +@COND_ICC_PCH_1@__test_PCH_INC = -use_pch \ @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 @@ -204,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 = $(ICC_PCH_USE_SWITCH) \ +@COND_ICC_PCH_1@__test_gui_PCH_INC = -use_pch \ @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 @@ -236,8 +236,7 @@ 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 = \ -@COND_ICC_PCH_1@ $(ICC_PCH_USE_SWITCH) \ +@COND_ICC_PCH_1@__printfbench_PCH_INC = -use_pch \ @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 +572,9 @@ test_gui_textentrytest.o: $(srcdir)/controls/textentrytest.cpp $(TEST_GUI_ODEP) test_gui_treectrltest.o: $(srcdir)/controls/treectrltest.cpp $(TEST_GUI_ODEP) $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/treectrltest.cpp +test_gui_clone.o: $(srcdir)/events/clone.cpp $(TEST_GUI_ODEP) + $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/events/clone.cpp + test_gui_propagation.o: $(srcdir)/events/propagation.cpp $(TEST_GUI_ODEP) $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/events/propagation.cpp diff --git a/tests/events/clone.cpp b/tests/events/clone.cpp new file mode 100644 index 0000000000..450294f966 --- /dev/null +++ b/tests/events/clone.cpp @@ -0,0 +1,80 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: tests/events/clone.cpp +// Purpose: Test wxEvent::Clone() implementation by all event classes +// Author: Vadim Zeitlin, based on the code by Francesco Montorsi +// Created: 2009-03-22 +// RCS-ID: $Id$ +// Copyright: (c) 2009 Vadim Zeitlin +/////////////////////////////////////////////////////////////////////////////// + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +#include "testprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#ifndef WX_PRECOMP + #include "wx/event.h" +#endif // WX_PRECOMP + +// -------------------------------------------------------------------------- +// test class +// -------------------------------------------------------------------------- + +class EventCloneTestCase : public CppUnit::TestCase +{ +public: + EventCloneTestCase() {} + +private: + CPPUNIT_TEST_SUITE( EventCloneTestCase ); + CPPUNIT_TEST( CheckAll ); + CPPUNIT_TEST_SUITE_END(); + + void CheckAll(); + + DECLARE_NO_COPY_CLASS(EventCloneTestCase) +}; + +// register in the unnamed registry so that these tests are run by default +CPPUNIT_TEST_SUITE_REGISTRATION( EventCloneTestCase ); + +// also include in it's own registry so that these tests can be run alone +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( EventCloneTestCase, "EventCloneTestCase" ); + +void EventCloneTestCase::CheckAll() +{ + // check if event classes implement Clone() correctly + // NOTE: the check is done against _all_ event classes which are linked to + // the executable currently running, which are not necessarily all + // wxWidgets event classes. + const wxClassInfo *ci = wxClassInfo::GetFirst(); + for (; ci; ci = ci->GetNext()) + { + // is this class derived from wxEvent? + if ( !ci->IsKindOf(CLASSINFO(wxEvent)) || + wxString(ci->GetClassName()) == "wxEvent" ) + continue; + + const std::string + msg = std::string("Event class \"") + ci->GetClassName() + "\""; + + CPPUNIT_ASSERT_MESSAGE( msg, ci->IsDynamic() ); + + wxEvent * const test = wxDynamicCast(ci->CreateObject(),wxEvent); + CPPUNIT_ASSERT_MESSAGE( msg, test ); + + wxEvent * const cloned = test->Clone(); + delete test; + + CPPUNIT_ASSERT_MESSAGE( msg, cloned ); + CPPUNIT_ASSERT_MESSAGE( msg, cloned->GetClassInfo() == ci ); + + delete cloned; + } +} + diff --git a/tests/makefile.bcc b/tests/makefile.bcc index 71404d9c60..838c2bbd9b 100644 --- a/tests/makefile.bcc +++ b/tests/makefile.bcc @@ -117,6 +117,7 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_textctrltest.obj \ $(OBJS)\test_gui_textentrytest.obj \ $(OBJS)\test_gui_treectrltest.obj \ + $(OBJS)\test_gui_clone.obj \ $(OBJS)\test_gui_propagation.obj \ $(OBJS)\test_gui_fonttest.obj \ $(OBJS)\test_gui_rawbmp.obj \ @@ -615,6 +616,9 @@ $(OBJS)\test_gui_textentrytest.obj: .\controls\textentrytest.cpp $(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\treectrltest.cpp +$(OBJS)\test_gui_clone.obj: .\events\clone.cpp + $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\clone.cpp + $(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp diff --git a/tests/makefile.gcc b/tests/makefile.gcc index ccf07daafb..82e1597bf3 100644 --- a/tests/makefile.gcc +++ b/tests/makefile.gcc @@ -110,6 +110,7 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_textctrltest.o \ $(OBJS)\test_gui_textentrytest.o \ $(OBJS)\test_gui_treectrltest.o \ + $(OBJS)\test_gui_clone.o \ $(OBJS)\test_gui_propagation.o \ $(OBJS)\test_gui_fonttest.o \ $(OBJS)\test_gui_rawbmp.o \ @@ -595,6 +596,9 @@ $(OBJS)\test_gui_textentrytest.o: ./controls/textentrytest.cpp $(OBJS)\test_gui_treectrltest.o: ./controls/treectrltest.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\test_gui_clone.o: ./events/clone.cpp + $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\test_gui_propagation.o: ./events/propagation.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< diff --git a/tests/makefile.vc b/tests/makefile.vc index 50cbae5b07..1e12ccadba 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -113,6 +113,7 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_textctrltest.obj \ $(OBJS)\test_gui_textentrytest.obj \ $(OBJS)\test_gui_treectrltest.obj \ + $(OBJS)\test_gui_clone.obj \ $(OBJS)\test_gui_propagation.obj \ $(OBJS)\test_gui_fonttest.obj \ $(OBJS)\test_gui_rawbmp.obj \ @@ -700,6 +701,9 @@ $(OBJS)\test_gui_textentrytest.obj: .\controls\textentrytest.cpp $(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\treectrltest.cpp +$(OBJS)\test_gui_clone.obj: .\events\clone.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\clone.cpp + $(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp diff --git a/tests/makefile.wat b/tests/makefile.wat index 1667a4bd65..2272436a31 100644 --- a/tests/makefile.wat +++ b/tests/makefile.wat @@ -18,11 +18,7 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else ! loaddll wlink wlink -! endif ! loaddll wlib wlibd !endif @@ -348,6 +344,7 @@ TEST_GUI_OBJECTS = & $(OBJS)\test_gui_textctrltest.obj & $(OBJS)\test_gui_textentrytest.obj & $(OBJS)\test_gui_treectrltest.obj & + $(OBJS)\test_gui_clone.obj & $(OBJS)\test_gui_propagation.obj & $(OBJS)\test_gui_fonttest.obj & $(OBJS)\test_gui_rawbmp.obj & @@ -656,6 +653,9 @@ $(OBJS)\test_gui_textentrytest.obj : .AUTODEPEND .\controls\textentrytest.cpp $(OBJS)\test_gui_treectrltest.obj : .AUTODEPEND .\controls\treectrltest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< +$(OBJS)\test_gui_clone.obj : .AUTODEPEND .\events\clone.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + $(OBJS)\test_gui_propagation.obj : .AUTODEPEND .\events\propagation.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< diff --git a/tests/test.bkl b/tests/test.bkl index 3cb355ce2b..f2a24aa321 100644 --- a/tests/test.bkl +++ b/tests/test.bkl @@ -114,6 +114,7 @@ controls/textctrltest.cpp controls/textentrytest.cpp controls/treectrltest.cpp + events/clone.cpp events/propagation.cpp font/fonttest.cpp image/rawbmp.cpp diff --git a/tests/test_test_gui.dsp b/tests/test_test_gui.dsp index 3596361d32..f6ff7d1a2a 100644 --- a/tests/test_test_gui.dsp +++ b/tests/test_test_gui.dsp @@ -239,6 +239,10 @@ SOURCE=.\window\clientsize.cpp # End Source File # Begin Source File +SOURCE=.\events\clone.cpp +# End Source File +# Begin Source File + SOURCE=.\controls\comboboxtest.cpp # End Source File # Begin Source File diff --git a/tests/test_vc7_printfbench.vcproj b/tests/test_vc7_printfbench.vcproj index e924b9de65..ca4442cb31 100644 --- a/tests/test_vc7_printfbench.vcproj +++ b/tests/test_vc7_printfbench.vcproj @@ -17,29 +17,27 @@ + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/> + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/> + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/> + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/> + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/> + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/> + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/> + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/> + Name="DLL Universal Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Debug|Win32"> + Name="Universal Release|Win32"> + Name="Universal Debug|Win32"> + Name="Release|Win32"> + Name="Debug|Win32"> diff --git a/tests/test_vc7_test.vcproj b/tests/test_vc7_test.vcproj index 17c607c6d4..aa0bfc57a5 100644 --- a/tests/test_vc7_test.vcproj +++ b/tests/test_vc7_test.vcproj @@ -17,29 +17,27 @@ + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/> + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/> + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/> + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/> + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/> + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/> + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/> + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/> + Name="DLL Universal Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Debug|Win32"> + Name="Universal Release|Win32"> + Name="Universal Debug|Win32"> + Name="Release|Win32"> + Name="Debug|Win32"> diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj index f07e10727e..234fd2736f 100644 --- a/tests/test_vc7_test_gui.vcproj +++ b/tests/test_vc7_test_gui.vcproj @@ -17,29 +17,27 @@ + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"/> + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"/> + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"/> + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"/> + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"/> + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"/> + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"/> + Name="VCMIDLTool"/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"/> + + @@ -569,49 +564,49 @@ + Name="DLL Universal Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Debug|Win32"> + Name="Universal Release|Win32"> + Name="Universal Debug|Win32"> + Name="Release|Win32"> + Name="Debug|Win32"> @@ -677,7 +672,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 e180c7f2c1..c74a8c5852 100644 --- a/tests/test_vc8_printfbench.vcproj +++ b/tests/test_vc8_printfbench.vcproj @@ -22,9 +22,9 @@ @@ -105,7 +101,7 @@ /> @@ -202,7 +200,7 @@ /> @@ -302,7 +296,7 @@ /> @@ -399,7 +395,7 @@ /> @@ -499,7 +491,7 @@ /> @@ -596,7 +590,7 @@ /> @@ -696,7 +686,7 @@ /> @@ -793,7 +785,7 @@ /> @@ -105,7 +101,7 @@ /> @@ -202,7 +200,7 @@ /> @@ -302,7 +296,7 @@ /> @@ -399,7 +395,7 @@ /> @@ -499,7 +491,7 @@ /> @@ -596,7 +590,7 @@ /> @@ -696,7 +686,7 @@ /> @@ -793,7 +785,7 @@ /> @@ -105,7 +101,7 @@ /> @@ -202,7 +200,7 @@ /> @@ -302,7 +296,7 @@ /> @@ -399,7 +395,7 @@ /> @@ -499,7 +491,7 @@ /> @@ -596,7 +590,7 @@ /> @@ -696,7 +686,7 @@ /> @@ -793,7 +785,7 @@ /> + + @@ -835,7 +831,7 @@ RelativePath=".\dummy.cpp" > diff --git a/tests/test_vc9.sln b/tests/test_vc9.sln index d4163d3616..9e08286566 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 - 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 + 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 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Debug|Win32.ActiveCfg = Debug|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Debug|Win32.Build.0 = 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}.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 - {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 + {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 - {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 + {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 + {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 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Debug|Win32.ActiveCfg = Debug|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Debug|Win32.Build.0 = Debug|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/tests/test_vc9_printfbench.vcproj b/tests/test_vc9_printfbench.vcproj index 292019552d..f076ccfca9 100644 --- a/tests/test_vc9_printfbench.vcproj +++ b/tests/test_vc9_printfbench.vcproj @@ -22,9 +22,9 @@ @@ -104,7 +101,7 @@ /> @@ -198,7 +196,7 @@ /> @@ -294,7 +289,7 @@ /> @@ -388,7 +384,7 @@ /> @@ -484,7 +477,7 @@ /> @@ -578,7 +572,7 @@ /> @@ -674,7 +665,7 @@ /> @@ -768,7 +760,7 @@ /> @@ -104,7 +101,7 @@ /> @@ -198,7 +196,7 @@ /> @@ -294,7 +289,7 @@ /> @@ -388,7 +384,7 @@ /> @@ -484,7 +477,7 @@ /> @@ -578,7 +572,7 @@ /> @@ -674,7 +665,7 @@ /> @@ -768,7 +760,7 @@ /> @@ -104,7 +101,7 @@ /> @@ -198,7 +196,7 @@ /> @@ -294,7 +289,7 @@ /> @@ -388,7 +384,7 @@ /> @@ -484,7 +477,7 @@ /> @@ -578,7 +572,7 @@ /> @@ -674,7 +665,7 @@ /> @@ -768,7 +760,7 @@ /> + + @@ -807,7 +803,7 @@ RelativePath=".\dummy.cpp" > -- 2.47.2