Reviewed by Adam Roben.
authorap@webkit.org <ap@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 18 Nov 2007 17:54:55 +0000 (17:54 +0000)
committerap@webkit.org <ap@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 18 Nov 2007 17:54:55 +0000 (17:54 +0000)
        Make run-webkit-tests work with Windows debug build.

        * DumpRenderTree/win/DumpRenderTree.cpp: (main): Only use memory checks with debug CRT.
        * DumpRenderTree/win/DumpRenderTree.vcproj: Switched Debug configuration to release CRT,
        as it is supposed to run with release Apple libraries. Removed _DEBUG preprocessor
        symbol, as it goes with debug CRT (AFAIK, it is supposed to be added automatically,
        and shouldn't be needed in Debug_internal configuration, but I didn't dare to change that).

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27890 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj

index de72e3d..fd27dcf 100644 (file)
@@ -1,3 +1,15 @@
+2007-11-18  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Adam Roben.
+
+        Make run-webkit-tests work with Windows debug build.
+
+        * DumpRenderTree/win/DumpRenderTree.cpp: (main): Only use memory checks with debug CRT.
+        * DumpRenderTree/win/DumpRenderTree.vcproj: Switched Debug configuration to release CRT,
+        as it is supposed to run with release Apple libraries. Removed _DEBUG preprocessor
+        symbol, as it goes with debug CRT (AFAIK, it is supposed to be added automatically,
+        and shouldn't be needed in Debug_internal configuration, but I didn't dare to change that).
+
 2007-11-18  Kevin Ollivier  <kevino@theolliviers.com>
 
         Add wxWebKit sample and build script, and integrate it with 
index df7efb3..c215993 100644 (file)
@@ -886,9 +886,11 @@ int main(int argc, char* argv[])
     if (FAILED(webView->mainFrame(&frame)))
         return -1;
 
+#ifdef _DEBUG
     _CrtMemState entryToMainMemCheckpoint;
     if (leakChecking)
         _CrtMemCheckpoint(&entryToMainMemCheckpoint);
+#endif
 
     for (int i = 0; i < argc; ++i)
         if (!stricmp(argv[i], "--threaded")) {
@@ -927,12 +929,14 @@ int main(int argc, char* argv[])
     delete policyDelegate;
     frame->Release();
 
+#ifdef _DEBUG
     if (leakChecking) {
         // dump leaks to stderr
         _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
         _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
         _CrtMemDumpAllObjectsSince(&entryToMainMemCheckpoint);
     }
+#endif
 
     return 0;
 }
index 83ded6f..6447bc4 100644 (file)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
+<?xml version="1.0" encoding="windows-1251"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="8.00"\r
+       Version="8,00"\r
        Name="DumpRenderTree"\r
        ProjectGUID="{6567DFD4-D6DE-4CD5-825D-17E353D160E1}"\r
        RootNamespace="DumpRenderTree"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="&quot;$(ProjectDir)\.&quot;;&quot;$(ProjectDir)\..&quot;;&quot;$(WebKitOutputDir)\Include&quot;;&quot;$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;;&quot;$(WebKitOutputDir)\Include\WebCore&quot;;&quot;$(WebKitLibrariesDir)\Include\WebCore&quot;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"\r
+                               PreprocessorDefinitions="WIN32;_CONSOLE;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="1"\r
                                Detect64BitPortabilityProblems="true"\r