[Cppunit-cvs] cppunit/src/qttestrunner make_lib,NONE,1.1 make_lib.bat,NONE,1.1 qttestrunner.vcproj,N
Brought to you by:
blep
Menu
▾
▴
[Cppunit-cvs] cppunit/src/qttestrunner make_lib,NONE,1.1 make_lib.bat,NONE,1.1 qttestrunner.vcproj,NONE,1.1 qttestrunner_dll.vcproj,NONE,1.1 qttestrunnerlib.pro,NONE,1.1 TestFailureListViewItem.cpp,1.1,1.2 TestRunnerDlgImpl.cpp,1.3,1.4 QtTestRunnerDll.pro,1.2,NONE build,1.1,NONE build.bat,1.1,NONE qttestrunner.pro,1.2,NONE
|
From: Baptiste L. <bl...@us...> - 2005-12-12 07:40:18
|
Update of /cvsroot/cppunit/cppunit/src/qttestrunner In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32369/src/qttestrunner Modified Files: TestFailureListViewItem.cpp TestRunnerDlgImpl.cpp Added Files: make_lib make_lib.bat qttestrunner.vcproj qttestrunner_dll.vcproj qttestrunnerlib.pro Removed Files: QtTestRunnerDll.pro build build.bat qttestrunner.pro Log Message: * integrated Ernst patch for QtTestRunner and Qt 3.x. * upgrade QtTestRunner to Qt 3.x * enhanced qmake project files to handle multiple build configuration --- NEW FILE: qttestrunner_dll.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.10" Name="qttestrunner_dll" ProjectGUID="{0D1BB705-1AE7-395D-A78A-2012D1F25FC9}"> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Release|Win32" OutputDirectory=".\ReleaseDLL" IntermediateDirectory=".\ReleaseDLL" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="-Zm200 -GX -GX -w34100 -w34189" Optimization="1" AdditionalIncludeDirectories="..\..\include,$(QTDIR)\include,.,tmp\moc\,$(QTDIR)\mkspecs\win32-msvc.net" PreprocessorDefinitions="QTTESTRUNNER_DLL_BUILD, _WINDOWS,UNICODE,WIN32,QT_DLL,QT_THREAD_SUPPORT,NDEBUG,QT_NO_DEBUG" GeneratePreprocessedFile="0" MinimalRebuild="TRUE" ExceptionHandling="TRUE" RuntimeLibrary="2" BufferSecurityCheck="FALSE" RuntimeTypeInfo="TRUE" AssemblerListingLocation=".\ReleaseDLL/" ObjectFile=".\ReleaseDLL/" ProgramDataBaseFileName=".\ReleaseDLL/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" IgnoreImportLibrary="FALSE" AdditionalDependencies="cppunit_dll.lib qt-mt335.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib delayimp.lib" OutputFile=".\ReleaseDLL\qttestrunner_dll.dll" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\lib,$(QTDIR)\lib" DelayLoadDLLs="comdlg32.dll,oleaut32.dll,winmm.dll,wsock32.dll,winspool.dll" GenerateDebugInformation="FALSE" ProgramDatabaseFile="" SubSystem="2" BaseAddress="" TargetMachine="1"/> <Tool Name="VCMIDLTool" WarningLevel="0" DefaultCharType="0" EnableErrorChecks="1"/> <Tool Name="VCPostBuildEventTool" Description="Copying $(TargetName).dll and $(TargetName).lib to lib/" CommandLine="copy "$(TargetDir)$(TargetName).dll" ..\..\lib\"$(TargetName)".dll copy "$(TargetDir)$(TargetName).lib" ..\..\lib\"$(TargetName)".lib "/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Debug|Win32" OutputDirectory=".\DebugDLL" IntermediateDirectory=".\DebugDLL" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="-Zm200 -GX -GX -w34100 -w34189" Optimization="0" AdditionalIncludeDirectories="..\..\include,$(QTDIR)\include,.,$(QTDIR)\mkspecs\win32-msvc.net" PreprocessorDefinitions="QTTESTRUNNER_DLL_BUILD, _WINDOWS,UNICODE,WIN32,QT_DLL,QT_THREAD_SUPPORT" GeneratePreprocessedFile="0" MinimalRebuild="FALSE" ExceptionHandling="TRUE" RuntimeLibrary="3" BufferSecurityCheck="FALSE" RuntimeTypeInfo="TRUE" AssemblerListingLocation=".\DebugDLL/" ObjectFile=".\DebugDLL/" ProgramDataBaseFileName=".\DebugDLL/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="1" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" IgnoreImportLibrary="FALSE" AdditionalDependencies="cppunitd_dll.lib qt-mt335.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib delayimp.lib" OutputFile=".\DebugDLL\qttestrunnerd_dll.dll" LinkIncremental="0" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\lib,$(QTDIR)\lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="" SubSystem="2" BaseAddress="" ImportLibrary=".\DebugDLL\qttestrunnerd_dll.lib" TargetMachine="1"/> <Tool Name="VCMIDLTool" WarningLevel="0" DefaultCharType="0" EnableErrorChecks="1"/> <Tool Name="VCPostBuildEventTool" Description="Copying $(TargetName).dll and $(TargetName).lib to lib/" CommandLine="copy "$(TargetDir)$(TargetName).dll" ..\..\lib\"$(TargetName)".dll copy "$(TargetDir)$(TargetName).lib" ..\..\lib\"$(TargetName)".lib "/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File RelativePath=".\MostRecentTests.cpp"> </File> <File RelativePath=".\QtTestRunner.cpp"> </File> <File RelativePath=".\TestBrowserDlgImpl.cpp"> </File> <File RelativePath=".\TestFailureInfo.cpp"> </File> <File RelativePath=".\TestFailureListViewItem.cpp"> </File> <File RelativePath=".\TestListViewItem.cpp"> </File> <File RelativePath=".\TestRunnerDlgImpl.cpp"> </File> <File RelativePath=".\TestRunnerFailureEvent.cpp"> </File> <File RelativePath=".\TestRunnerModel.cpp"> </File> <File RelativePath=".\TestRunnerModelThreadInterface.cpp"> </File> <File RelativePath=".\TestRunnerTestCaseRunEvent.cpp"> </File> <File RelativePath=".\TestRunnerThread.cpp"> </File> <File RelativePath=".\TestRunnerThreadEvent.cpp"> </File> <File RelativePath=".\TestRunnerThreadFinishedEvent.cpp"> </File> </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl"> <File RelativePath=".\MostRecentTests.h"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing MostRecentTests.h..." CommandLine="$(QTDIR)\bin\moc.exe .\MostRecentTests.h -o tmp\moc\moc_MostRecentTests.cpp " AdditionalDependencies="$(QTDIR)\bin\moc.exe" Outputs="tmp\moc\moc_MostRecentTests.cpp"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing MostRecentTests.h..." CommandLine="$(QTDIR)\bin\moc.exe .\MostRecentTests.h -o tmp\moc\moc_MostRecentTests.cpp " AdditionalDependencies="$(QTDIR)\bin\moc.exe" Outputs="tmp\moc\moc_MostRecentTests.cpp"/> </FileConfiguration> </File> <File RelativePath=".\TestBrowserDlgImpl.h"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing TestBrowserDlgImpl.h..." CommandLine="$(QTDIR)\bin\moc.exe .\TestBrowserDlgImpl.h -o tmp\moc\moc_TestBrowserDlgImpl.cpp " AdditionalDependencies="$(QTDIR)\bin\moc.exe" Outputs="tmp\moc\moc_TestBrowserDlgImpl.cpp"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing TestBrowserDlgImpl.h..." CommandLine="$(QTDIR)\bin\moc.exe .\TestBrowserDlgImpl.h -o tmp\moc\moc_TestBrowserDlgImpl.cpp " AdditionalDependencies="$(QTDIR)\bin\moc.exe" Outputs="tmp\moc\moc_TestBrowserDlgImpl.cpp"/> </FileConfiguration> </File> <File RelativePath=".\TestFailureInfo.h"> </File> <File RelativePath=".\TestFailureListViewItem.h"> </File> <File RelativePath=".\TestListViewItem.h"> </File> <File RelativePath=".\TestRunnerDlgImpl.h"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing TestRunnerDlgImpl.h..." CommandLine="$(QTDIR)\bin\moc.exe .\TestRunnerDlgImpl.h -o tmp\moc\moc_TestRunnerDlgImpl.cpp " AdditionalDependencies="$(QTDIR)\bin\moc.exe" Outputs="tmp\moc\moc_TestRunnerDlgImpl.cpp"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing TestRunnerDlgImpl.h..." CommandLine="$(QTDIR)\bin\moc.exe .\TestRunnerDlgImpl.h -o tmp\moc\moc_TestRunnerDlgImpl.cpp " AdditionalDependencies="$(QTDIR)\bin\moc.exe" Outputs="tmp\moc\moc_TestRunnerDlgImpl.cpp"/> </FileConfiguration> </File> <File RelativePath=".\TestRunnerFailureEvent.h"> </File> <File RelativePath=".\TestRunnerModel.h"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing TestRunnerModel.h..." CommandLine="$(QTDIR)\bin\moc.exe .\TestRunnerModel.h -o tmp\moc\moc_TestRunnerModel.cpp " AdditionalDependencies="$(QTDIR)\bin\moc.exe" Outputs="tmp\moc\moc_TestRunnerModel.cpp"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing TestRunnerModel.h..." CommandLine="$(QTDIR)\bin\moc.exe .\TestRunnerModel.h -o tmp\moc\moc_TestRunnerModel.cpp " AdditionalDependencies="$(QTDIR)\bin\moc.exe" Outputs="tmp\moc\moc_TestRunnerModel.cpp"/> </FileConfiguration> </File> <File RelativePath=".\TestRunnerModelThreadInterface.h"> </File> <File RelativePath=".\TestRunnerTestCaseRunEvent.h"> </File> <File RelativePath=".\TestRunnerThread.h"> </File> <File RelativePath=".\TestRunnerThreadEvent.h"> </File> <File RelativePath=".\TestRunnerThreadFinishedEvent.h"> </File> </Filter> <Filter Name="Generated MOC Files" Filter="cpp;c;cxx;moc"> <File RelativePath=".\tmp\moc\moc_MostRecentTests.cpp"> </File> <File RelativePath=".\tmp\moc\moc_testbrowserdlg.cpp"> </File> <File RelativePath=".\tmp\moc\moc_TestBrowserDlgImpl.cpp"> </File> <File RelativePath=".\tmp\moc\moc_testrunnerdlg.cpp"> </File> <File RelativePath=".\tmp\moc\moc_TestRunnerDlgImpl.cpp"> </File> <File RelativePath=".\tmp\moc\moc_TestRunnerModel.cpp"> </File> </Filter> <Filter Name="Generated UI Files"> <File RelativePath=".\testbrowserdlg.cpp"> </File> <File RelativePath=".\testbrowserdlg.h"> </File> <File RelativePath=".\testrunnerdlg.cpp"> </File> <File RelativePath=".\testrunnerdlg.h"> </File> </Filter> <Filter Name="Forms"> <File RelativePath=".\testbrowserdlg.ui"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Uic'ing testbrowserdlg.ui..." CommandLine="$(QTDIR)\bin\uic.exe ".\testbrowserdlg.ui" -o ".\testbrowserdlg.h" && $(QTDIR)\bin\uic.exe ".\testbrowserdlg.ui" -i ".\testbrowserdlg.h" -o ".\testbrowserdlg.cpp" && $(QTDIR)\bin\moc.exe ".\testbrowserdlg.h" -o "tmp\moc\moc_testbrowserdlg.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;$(QTDIR)\bin\uic.exe" Outputs="".\testbrowserdlg.h";".\testbrowserdlg.cpp";"tmp\moc\moc_testbrowserdlg.cpp""/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Uic'ing testbrowserdlg.ui..." CommandLine="$(QTDIR)\bin\uic.exe ".\testbrowserdlg.ui" -o ".\testbrowserdlg.h" && $(QTDIR)\bin\uic.exe ".\testbrowserdlg.ui" -i ".\testbrowserdlg.h" -o ".\testbrowserdlg.cpp" && $(QTDIR)\bin\moc.exe ".\testbrowserdlg.h" -o "tmp\moc\moc_testbrowserdlg.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;$(QTDIR)\bin\uic.exe" Outputs="".\testbrowserdlg.h";".\testbrowserdlg.cpp";"tmp\moc\moc_testbrowserdlg.cpp""/> </FileConfiguration> </File> <File RelativePath=".\testrunnerdlg.ui"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Uic'ing testrunnerdlg.ui..." CommandLine="$(QTDIR)\bin\uic.exe ".\testrunnerdlg.ui" -o ".\testrunnerdlg.h" && $(QTDIR)\bin\uic.exe ".\testrunnerdlg.ui" -i ".\testrunnerdlg.h" -o ".\testrunnerdlg.cpp" && $(QTDIR)\bin\moc.exe ".\testrunnerdlg.h" -o "tmp\moc\moc_testrunnerdlg.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;$(QTDIR)\bin\uic.exe" Outputs="".\testrunnerdlg.h";".\testrunnerdlg.cpp";"tmp\moc\moc_testrunnerdlg.cpp""/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Uic'ing testrunnerdlg.ui..." CommandLine="$(QTDIR)\bin\uic.exe ".\testrunnerdlg.ui" -o ".\testrunnerdlg.h" && $(QTDIR)\bin\uic.exe ".\testrunnerdlg.ui" -i ".\testrunnerdlg.h" -o ".\testrunnerdlg.cpp" && $(QTDIR)\bin\moc.exe ".\testrunnerdlg.h" -o "tmp\moc\moc_testrunnerdlg.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;$(QTDIR)\bin\uic.exe" Outputs="".\testrunnerdlg.h";".\testrunnerdlg.cpp";"tmp\moc\moc_testrunnerdlg.cpp""/> </FileConfiguration> </File> </Filter> </Files> <Globals> </Globals> </VisualStudioProject> --- build.bat DELETED --- --- NEW FILE: qttestrunner.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.10" Name="qttestrunner" ProjectGUID="{C633317B-D39C-303A-AFC4-1B8782FD4E4C}"> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Release|Win32" OutputDirectory=".\Release" IntermediateDirectory=".\Release" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="-Zm200 -GX -GX -w34100 -w34189" Optimization="1" AdditionalIncludeDirectories="..\..\include,$(QTDIR)\include,.,$(QTDIR)\mkspecs\win32-msvc.net" PreprocessorDefinitions="QT_NO_DEBUG,NDEBUG,UNICODE,WIN32,QT_DLL,QT_THREAD_SUPPORT,NDEBUG" GeneratePreprocessedFile="0" ExceptionHandling="TRUE" RuntimeLibrary="2" BufferSecurityCheck="FALSE" RuntimeTypeInfo="TRUE" AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="0" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" OutputFile=".\Release\qttestrunner.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool" WarningLevel="0" DefaultCharType="0" EnableErrorChecks="1"/> <Tool Name="VCPostBuildEventTool" Description="Copying $(TargetName).lib to lib/" CommandLine="copy "$(TargetDir)$(TargetName).lib" ..\..\lib\"$(TargetName)".lib"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Debug|Win32" OutputDirectory=".\Debug" IntermediateDirectory=".\Debug" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="-Zm200 -GX -GX -w34100 -w34189" Optimization="0" AdditionalIncludeDirectories="..\..\include,$(QTDIR)\include,.,$(QTDIR)\mkspecs\win32-msvc.net" PreprocessorDefinitions="UNICODE,WIN32,QT_DLL,QT_THREAD_SUPPORT" GeneratePreprocessedFile="0" MinimalRebuild="FALSE" ExceptionHandling="TRUE" RuntimeLibrary="3" BufferSecurityCheck="FALSE" RuntimeTypeInfo="TRUE" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="1" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" OutputFile=".\Debug\qttestrunnerd.lib" SuppressStartupBanner="TRUE"/> <Tool Name="VCMIDLTool" WarningLevel="0" DefaultCharType="0" EnableErrorChecks="1"/> <Tool Name="VCPostBuildEventTool" Description="Copying $(TargetName).lib to lib/" CommandLine="copy "$(TargetDir)$(TargetName).lib" ..\..\lib\"$(TargetName)".lib "/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File RelativePath=".\MostRecentTests.cpp"> </File> <File RelativePath=".\QtTestRunner.cpp"> </File> <File RelativePath=".\TestBrowserDlgImpl.cpp"> </File> <File RelativePath=".\TestFailureInfo.cpp"> </File> <File RelativePath=".\TestFailureListViewItem.cpp"> </File> <File RelativePath=".\TestListViewItem.cpp"> </File> <File RelativePath=".\TestRunnerDlgImpl.cpp"> </File> <File RelativePath=".\TestRunnerFailureEvent.cpp"> </File> <File RelativePath=".\TestRunnerModel.cpp"> </File> <File RelativePath=".\TestRunnerModelThreadInterface.cpp"> </File> <File RelativePath=".\TestRunnerTestCaseRunEvent.cpp"> </File> <File RelativePath=".\TestRunnerThread.cpp"> </File> <File RelativePath=".\TestRunnerThreadEvent.cpp"> </File> <File RelativePath=".\TestRunnerThreadFinishedEvent.cpp"> </File> </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl"> <File RelativePath=".\MostRecentTests.h"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing MostRecentTests.h..." CommandLine="$(QTDIR)\bin\moc.exe -DQT_NO_DEBUG -DNDEBUG -DUNICODE -DWIN32 -DQT_DLL -DQT_THREAD_SUPPORT -DNDEBUG -I".\..\..\include" -I"$(QTDIR)\include" -I"." -I"$(QTDIR)\mkspecs\win32-msvc.net" ".\MostRecentTests.h" -o "tmp\moc\moc_MostRecentTests.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe" Outputs="tmp\moc\moc_MostRecentTests.cpp"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing MostRecentTests.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_DLL -DQT_THREAD_SUPPORT -I".\..\..\include" -I"$(QTDIR)\include" -I"." -I"$(QTDIR)\mkspecs\win32-msvc.net" ".\MostRecentTests.h" -o "tmp\moc\moc_MostRecentTests.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe" Outputs="tmp\moc\moc_MostRecentTests.cpp"/> </FileConfiguration> </File> <File RelativePath=".\TestBrowserDlgImpl.h"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing TestBrowserDlgImpl.h..." CommandLine="$(QTDIR)\bin\moc.exe -DQT_NO_DEBUG -DNDEBUG -DUNICODE -DWIN32 -DQT_DLL -DQT_THREAD_SUPPORT -DNDEBUG -I".\..\..\include" -I"$(QTDIR)\include" -I"." -I"$(QTDIR)\mkspecs\win32-msvc.net" ".\TestBrowserDlgImpl.h" -o "tmp\moc\moc_TestBrowserDlgImpl.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe" Outputs="tmp\moc\moc_TestBrowserDlgImpl.cpp"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing TestBrowserDlgImpl.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_DLL -DQT_THREAD_SUPPORT -I".\..\..\include" -I"$(QTDIR)\include" -I"." -I"$(QTDIR)\mkspecs\win32-msvc.net" ".\TestBrowserDlgImpl.h" -o "tmp\moc\moc_TestBrowserDlgImpl.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe" Outputs="tmp\moc\moc_TestBrowserDlgImpl.cpp"/> </FileConfiguration> </File> <File RelativePath=".\TestFailureInfo.h"> </File> <File RelativePath=".\TestFailureListViewItem.h"> </File> <File RelativePath=".\TestListViewItem.h"> </File> <File RelativePath=".\TestRunnerDlgImpl.h"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing TestRunnerDlgImpl.h..." CommandLine="$(QTDIR)\bin\moc.exe -DQT_NO_DEBUG -DNDEBUG -DUNICODE -DWIN32 -DQT_DLL -DQT_THREAD_SUPPORT -DNDEBUG -I".\..\..\include" -I"$(QTDIR)\include" -I"." -I"$(QTDIR)\mkspecs\win32-msvc.net" ".\TestRunnerDlgImpl.h" -o "tmp\moc\moc_TestRunnerDlgImpl.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe" Outputs="tmp\moc\moc_TestRunnerDlgImpl.cpp"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing TestRunnerDlgImpl.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_DLL -DQT_THREAD_SUPPORT -I".\..\..\include" -I"$(QTDIR)\include" -I"." -I"$(QTDIR)\mkspecs\win32-msvc.net" ".\TestRunnerDlgImpl.h" -o "tmp\moc\moc_TestRunnerDlgImpl.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe" Outputs="tmp\moc\moc_TestRunnerDlgImpl.cpp"/> </FileConfiguration> </File> <File RelativePath=".\TestRunnerFailureEvent.h"> </File> <File RelativePath=".\TestRunnerModel.h"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing TestRunnerModel.h..." CommandLine="$(QTDIR)\bin\moc.exe -DQT_NO_DEBUG -DNDEBUG -DUNICODE -DWIN32 -DQT_DLL -DQT_THREAD_SUPPORT -DNDEBUG -I".\..\..\include" -I"$(QTDIR)\include" -I"." -I"$(QTDIR)\mkspecs\win32-msvc.net" ".\TestRunnerModel.h" -o "tmp\moc\moc_TestRunnerModel.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe" Outputs="tmp\moc\moc_TestRunnerModel.cpp"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing TestRunnerModel.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_DLL -DQT_THREAD_SUPPORT -I".\..\..\include" -I"$(QTDIR)\include" -I"." -I"$(QTDIR)\mkspecs\win32-msvc.net" ".\TestRunnerModel.h" -o "tmp\moc\moc_TestRunnerModel.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe" Outputs="tmp\moc\moc_TestRunnerModel.cpp"/> </FileConfiguration> </File> <File RelativePath=".\TestRunnerModelThreadInterface.h"> </File> <File RelativePath=".\TestRunnerTestCaseRunEvent.h"> </File> <File RelativePath=".\TestRunnerThread.h"> </File> <File RelativePath=".\TestRunnerThreadEvent.h"> </File> <File RelativePath=".\TestRunnerThreadFinishedEvent.h"> </File> </Filter> <Filter Name="Generated MOC Files" Filter="cpp;c;cxx;moc"> <File RelativePath=".\tmp\moc\moc_MostRecentTests.cpp"> </File> <File RelativePath=".\tmp\moc\moc_testbrowserdlg.cpp"> </File> <File RelativePath=".\tmp\moc\moc_TestBrowserDlgImpl.cpp"> </File> <File RelativePath=".\tmp\moc\moc_testrunnerdlg.cpp"> </File> <File RelativePath=".\tmp\moc\moc_TestRunnerDlgImpl.cpp"> </File> <File RelativePath=".\tmp\moc\moc_TestRunnerModel.cpp"> </File> </Filter> <Filter Name="Generated UI Files"> <File RelativePath=".\testbrowserdlg.cpp"> </File> <File RelativePath=".\testbrowserdlg.h"> </File> <File RelativePath=".\testrunnerdlg.cpp"> </File> <File RelativePath=".\testrunnerdlg.h"> </File> </Filter> <Filter Name="Forms"> <File RelativePath=".\testbrowserdlg.ui"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Uic'ing testbrowserdlg.ui..." CommandLine="$(QTDIR)\bin\uic.exe ".\testbrowserdlg.ui" -o ".\testbrowserdlg.h" && $(QTDIR)\bin\uic.exe ".\testbrowserdlg.ui" -i ".\testbrowserdlg.h" -o ".\testbrowserdlg.cpp" && $(QTDIR)\bin\moc.exe ".\testbrowserdlg.h" -o "tmp\moc\moc_testbrowserdlg.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;$(QTDIR)\bin\uic.exe" Outputs="".\testbrowserdlg.h";".\testbrowserdlg.cpp";"tmp\moc\moc_testbrowserdlg.cpp""/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Uic'ing testbrowserdlg.ui..." CommandLine="$(QTDIR)\bin\uic.exe ".\testbrowserdlg.ui" -o ".\testbrowserdlg.h" && $(QTDIR)\bin\uic.exe ".\testbrowserdlg.ui" -i ".\testbrowserdlg.h" -o ".\testbrowserdlg.cpp" && $(QTDIR)\bin\moc.exe ".\testbrowserdlg.h" -o "tmp\moc\moc_testbrowserdlg.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;$(QTDIR)\bin\uic.exe" Outputs="".\testbrowserdlg.h";".\testbrowserdlg.cpp";"tmp\moc\moc_testbrowserdlg.cpp""/> </FileConfiguration> </File> <File RelativePath=".\testrunnerdlg.ui"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Uic'ing testrunnerdlg.ui..." CommandLine="$(QTDIR)\bin\uic.exe ".\testrunnerdlg.ui" -o ".\testrunnerdlg.h" && $(QTDIR)\bin\uic.exe ".\testrunnerdlg.ui" -i ".\testrunnerdlg.h" -o ".\testrunnerdlg.cpp" && $(QTDIR)\bin\moc.exe ".\testrunnerdlg.h" -o "tmp\moc\moc_testrunnerdlg.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;$(QTDIR)\bin\uic.exe" Outputs="".\testrunnerdlg.h";".\testrunnerdlg.cpp";"tmp\moc\moc_testrunnerdlg.cpp""/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Uic'ing testrunnerdlg.ui..." CommandLine="$(QTDIR)\bin\uic.exe ".\testrunnerdlg.ui" -o ".\testrunnerdlg.h" && $(QTDIR)\bin\uic.exe ".\testrunnerdlg.ui" -i ".\testrunnerdlg.h" -o ".\testrunnerdlg.cpp" && $(QTDIR)\bin\moc.exe ".\testrunnerdlg.h" -o "tmp\moc\moc_testrunnerdlg.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;$(QTDIR)\bin\uic.exe" Outputs="".\testrunnerdlg.h";".\testrunnerdlg.cpp";"tmp\moc\moc_testrunnerdlg.cpp""/> </FileConfiguration> </File> </Filter> </Files> <Globals> </Globals> </VisualStudioProject> --- QtTestRunnerDll.pro DELETED --- Index: TestFailureListViewItem.cpp =================================================================== RCS file: /cvsroot/cppunit/cppunit/src/qttestrunner/TestFailureListViewItem.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TestFailureListViewItem.cpp 14 Oct 2001 12:23:31 -0000 1.1 --- TestFailureListViewItem.cpp 12 Dec 2005 07:40:09 -0000 1.2 *************** *** 14,17 **** --- 14,18 ---- _failure( failure ) { + setMultiLinesEnabled (true); } --- qttestrunner.pro DELETED --- --- build DELETED --- --- NEW FILE: qttestrunnerlib.pro --- #---------------------------------------------------------------------- # File: qttestrunnerlib.pro # Purpose: qmake config file for the QtTestRunner library. # The library is built as debug staticlib. Set the CONFIG # variable accordingly to build it differently. #---------------------------------------------------------------------- TEMPLATE = lib LANGUAGE = C++ # Get rid of possibly predefined options CONFIG -= debug CONFIG -= release CONFIG -= dll CONFIG -= staticlib CONFIG += qt warn_on debug staticlib #CONFIG += qt warn_on release staticlib #CONFIG += qt warn_on debug dll #CONFIG += qt warn_on release dll QTRUNNER_LIB = qttestrunner # Name of the library #---------------------------------------------------------------------- # MS Windows #---------------------------------------------------------------------- win32 { # Suppress program database creation (should better be done # in the qmake spec file) QMAKE_CXXFLAGS_DEBUG += /Z7 QMAKE_CXXFLAGS_DEBUG -= -Gm QMAKE_CXXFLAGS_DEBUG -= -Zi } win32 { MOC_DIR = tmp\moc UI_DIR = tmp\moc dll { DEFINES += QTTESTRUNNER_DLL_BUILD DLLDESTDIR = ..\..\lib debug { TARGET = $${QTRUNNER_LIB}d_dll QTRUNNER_IMPORTLIB = $${QTRUNNER_LIB}d_dll.lib OBJECTS_DIR = DebugDLL LIBS += ..\..\lib\cppunitd_dll.lib } release { TARGET = $${QTRUNNER_LIB}_dll QTRUNNER_IMPORTLIB = $${QTRUNNER_LIB}_dll.lib OBJECTS_DIR = ReleaseDLL LIBS += ..\..\lib\cppunit_dll.lib } DESTDIR = $${OBJECTS_DIR} QMAKE_CLEAN += $${QTRUNNER_IMPORTLIB} # Also copy the import library after build of the DLL QTRUNNER_IMPORTLIB = $${DESTDIR}-SEP-$${QTRUNNER_IMPORTLIB} QTRUNNER_IMPORTLIB ~= s/-SEP-/\/ QMAKE_POST_LINK = copy $${QTRUNNER_IMPORTLIB} $${DLLDESTDIR} } staticlib { DESTDIR = ..\..\lib debug { TARGET = $${QTRUNNER_LIB}d OBJECTS_DIR = Debug } release { TARGET = $${QTRUNNER_LIB} OBJECTS_DIR = Release } } } #---------------------------------------------------------------------- # Linux/Unix #---------------------------------------------------------------------- unix { MOC_DIR = .moc UI_DIR = .moc DESTDIR = ../../lib dll { debug { TARGET = $${QTRUNNER_LIB}d_shared OBJECTS_DIR = .obj_debug_shared LIBS += -L../../lib -lcppunit } release { TARGET = $${QTRUNNER_LIB}_shared OBJECTS_DIR = .obj_release_shared LIBS += -L../../lib -lcppunit } } staticlib { debug { TARGET = $${QTRUNNER_LIB}d OBJECTS_DIR = .obj_debug } release { TARGET = $${QTRUNNER_LIB} OBJECTS_DIR = .obj_release } } } #---------------------------------------------------------------------- HEADERS = \ MostRecentTests.h \ TestBrowserDlgImpl.h \ TestFailureInfo.h \ TestFailureListViewItem.h \ TestListViewItem.h \ TestRunnerDlgImpl.h \ TestRunnerFailureEvent.h \ TestRunnerModel.h \ TestRunnerModelThreadInterface.h \ TestRunnerTestCaseRunEvent.h \ TestRunnerThread.h \ TestRunnerThreadEvent.h \ TestRunnerThreadFinishedEvent.h \ ../../include/cppunit/ui/qt/TestRunner.h SOURCES = \ MostRecentTests.cpp \ TestBrowserDlgImpl.cpp \ TestFailureInfo.cpp \ TestFailureListViewItem.cpp \ TestListViewItem.cpp \ QtTestRunner.cpp \ TestRunnerDlgImpl.cpp \ TestRunnerFailureEvent.cpp \ TestRunnerModel.cpp \ TestRunnerModelThreadInterface.cpp \ TestRunnerTestCaseRunEvent.cpp \ TestRunnerThread.cpp \ TestRunnerThreadEvent.cpp \ TestRunnerThreadFinishedEvent.cpp INTERFACES = \ testbrowserdlg.ui \ testrunnerdlg.ui INCLUDEPATH += . ../../include Index: TestRunnerDlgImpl.cpp =================================================================== RCS file: /cvsroot/cppunit/cppunit/src/qttestrunner/TestRunnerDlgImpl.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TestRunnerDlgImpl.cpp 5 Jul 2005 21:17:41 -0000 1.3 --- TestRunnerDlgImpl.cpp 12 Dec 2005 07:40:09 -0000 1.4 *************** *** 181,185 **** QListViewItem *item = new TestFailureListViewItem( failure, _listFailures ); - item->setMultiLinesEnabled( true ); item->setText( indexType, failure->isError() ? tr("Error") : tr("Failure") ); --- 181,184 ---- *************** *** 188,192 **** CPPUNIT_NS::Exception *thrownException = failure->thrownException(); ! item->setText( indexMessage, thrownException->what() ); item->setText( indexFilename, failure->sourceLine().fileName().c_str() ); item->setText( indexLineNumber, --- 187,192 ---- CPPUNIT_NS::Exception *thrownException = failure->thrownException(); ! //2.0 item->setText( indexMessage, thrownException->what() ); ! item->setText( indexMessage, QString(thrownException->what()).stripWhiteSpace() ); item->setText( indexFilename, failure->sourceLine().fileName().c_str() ); item->setText( indexLineNumber, --- NEW FILE: make_lib --- #!/bin/tcsh ########################################################################### # FILE: make_lib # PURPOSE: Create Makefile from project file and then make QtTestRunner # library. ########################################################################### qmake qttestrunnerlib.pro make distclean make --- NEW FILE: make_lib.bat --- @REM make_lib.bat @REM @REM Create Makefile from project file and then make QtTestRunner library. qmake qttestrunnerlib.pro nmake distclean nmake |
