<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[189882] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/189882">189882</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-16 16:05:47 -0700 (Wed, 16 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/189875">r189875</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/189878">r189878</a>.
https://bugs.webkit.org/show_bug.cgi?id=149235
cygwin cmake build not ready yet (Requested by alexchristensen
on #webkit).
Reverted changesets:
"Switch AppleWin build to use CMake"
https://bugs.webkit.org/show_bug.cgi?id=149163
http://trac.webkit.org/changeset/189875
"Cygwin build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/189875">r189875</a>"
http://trac.webkit.org/changeset/189878</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsbuildwebkit">trunk/Tools/Scripts/build-webkit</a></li>
<li><a href="#trunkToolsScriptsrunapitests">trunk/Tools/Scripts/run-api-tests</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (189881 => 189882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-09-16 23:01:09 UTC (rev 189881)
+++ trunk/Tools/ChangeLog 2015-09-16 23:05:47 UTC (rev 189882)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-09-16 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r189875 and r189878.
+ https://bugs.webkit.org/show_bug.cgi?id=149235
+
+ cygwin cmake build not ready yet (Requested by alexchristensen
+ on #webkit).
+
+ Reverted changesets:
+
+ "Switch AppleWin build to use CMake"
+ https://bugs.webkit.org/show_bug.cgi?id=149163
+ http://trac.webkit.org/changeset/189875
+
+ "Cygwin build fix after r189875"
+ http://trac.webkit.org/changeset/189878
+
</ins><span class="cx"> 2015-09-16 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Cygwin build fix after r189875
</span></span></pre></div>
<a id="trunkToolsScriptsbuildwebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkit (189881 => 189882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkit 2015-09-16 23:01:09 UTC (rev 189881)
+++ trunk/Tools/Scripts/build-webkit 2015-09-16 23:05:47 UTC (rev 189882)
</span><span class="lines">@@ -256,14 +256,19 @@
</span><span class="cx"> $result = buildXCodeProject($projectPath, $clean, @local_options, @ARGV);
</span><span class="cx"> } elsif (isAppleWinWebKit() || isWinCairo()) {
</span><span class="cx"> chdirWebKit();
</span><del>- if (exitStatus(generateBuildSystemFromCMakeProject(isWinCairo() ? "WinCairo" : "AppleWin"))) {
- die "Run \"C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/vcvarsall.bat\" before build-webkit when using ninja";
- }
- if (canUseNinja()) {
- chdir "WebKitBuild/" . configuration();
- $result = system("ninja");
</del><ins>+ if (isWinCairo()) {
+ if (exitStatus(generateBuildSystemFromCMakeProject("WinCairo"))) {
+ die "Run \"C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/vcvarsall.bat\" before build-webkit when using ninja";
+ }
+ if (canUseNinja()) {
+ chdir "WebKitBuild/" . configuration();
+ $result = system("ninja");
+ } else {
+ $result = buildVisualStudioProject("WebKitBuild/" . configuration() . "/WebKit.sln", $clean);
+ }
</ins><span class="cx"> } else {
</span><del>- $result = buildVisualStudioProject("WebKitBuild/" . configuration() . "/WebKit.sln", $clean);
</del><ins>+ my $webkitSolutionPath = "Source/WebKit/WebKit.vcxproj/WebKit.sln";
+ $result = buildVisualStudioProject($webkitSolutionPath, $clean);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> # Various build* calls above may change the CWD.
</span></span></pre></div>
<a id="trunkToolsScriptsrunapitests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-api-tests (189881 => 189882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-api-tests 2015-09-16 23:01:09 UTC (rev 189881)
+++ trunk/Tools/Scripts/run-api-tests 2015-09-16 23:05:47 UTC (rev 189882)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> sub runTest($$);
</span><span class="cx"> sub runTestsBySuite(\@);
</span><span class="cx"> sub prepareEnvironmentForRunningTestTool();
</span><del>-sub testToolPaths();
</del><ins>+sub testToolPath();
</ins><span class="cx">
</span><span class="cx"> # Defined in VCSUtils.
</span><span class="cx"> sub possiblyColored($$);
</span><span class="lines">@@ -190,53 +190,50 @@
</span><span class="cx"> $childErr = ">&DEVNULL";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- foreach(testToolPaths()) {
- my $pid;
- my @commonArguments = ($_, $gtestArg, @ARGV);
- if (isIOSWebKit()) {
- $pid = open3($childIn, $childOut, $childErr, qw(xcrun -sdk iphonesimulator sim --environment=merge), @commonArguments) or die "Failed to run test: $test.";
- } elsif (isAppleMacWebKit() && architecture()) {
- $pid = open3($childIn, $childOut, $childErr, "arch", "-" . architecture(), @commonArguments) or die "Failed to run test: $test.";
- } else {
- $pid = open3($childIn, $childOut, $childErr, @commonArguments) or die "Failed to run test: $test.";
- }
</del><span class="cx">
</span><del>- eval {
- local $SIG{ALRM} = sub { die "alarm\n" };
- alarm $timeout;
- waitpid($pid, 0);
- alarm 0;
- $result = $?;
- };
- if ($@) {
- die unless $@ eq "alarm\n";
- kill SIGTERM, $pid or kill SIGKILL, $pid;
- $timedOut = 1;
- }
</del><ins>+ my $pid;
+ my @commonArguments = (testToolPath(), $gtestArg, @ARGV);
+ if (isIOSWebKit()) {
+ $pid = open3($childIn, $childOut, $childErr, qw(xcrun -sdk iphonesimulator sim --environment=merge), @commonArguments) or die "Failed to run test: $test.";
+ } elsif (isAppleMacWebKit() && architecture()) {
+ $pid = open3($childIn, $childOut, $childErr, "arch", "-" . architecture(), @commonArguments) or die "Failed to run test: $test.";
+ } else {
+ $pid = open3($childIn, $childOut, $childErr, @commonArguments) or die "Failed to run test: $test.";
+ }
</ins><span class="cx">
</span><del>- my @testOutput = <$childOut>;
- @testOutput = grep { !/^LEAK:/ } @testOutput unless $showLeaks;
- map { s/\*\*PASS\*\*/possiblyColored("bold green", "PASS")/eg } @testOutput;
- map { s/\*\*FAIL\*\*/possiblyColored("bold red", "FAIL")/eg } @testOutput;
- print STDOUT @testOutput;
</del><ins>+ eval {
+ local $SIG{ALRM} = sub { die "alarm\n" };
+ alarm $timeout;
+ waitpid($pid, 0);
+ alarm 0;
+ $result = $?;
+ };
+ if ($@) {
+ die unless $@ eq "alarm\n";
+ kill SIGTERM, $pid or kill SIGKILL, $pid;
+ $timedOut = 1;
+ }
</ins><span class="cx">
</span><del>- close($childIn);
- close($childOut);
- close($childErr) unless ($verbose || $showLeaks);
- close(DEVNULL) unless ($verbose || $showLeaks);
</del><ins>+ my @testOutput = <$childOut>;
+ @testOutput = grep { !/^LEAK:/ } @testOutput unless $showLeaks;
+ map { s/\*\*PASS\*\*/possiblyColored("bold green", "PASS")/eg } @testOutput;
+ map { s/\*\*FAIL\*\*/possiblyColored("bold red", "FAIL")/eg } @testOutput;
+ print STDOUT @testOutput;
</ins><span class="cx">
</span><del>- if ($result) {
- push @testsFailed, $test;
- }
- if ($timedOut) {
- push @testsTimedOut, $test;
- print possiblyColored("bold yellow", "TIMEOUT"), " $test\n";
- }
- if ($timedOut || $result) {
- return $timedOut || $result;
- }
</del><ins>+ close($childIn);
+ close($childOut);
+ close($childErr) unless ($verbose || $showLeaks);
+ close(DEVNULL) unless ($verbose || $showLeaks);
+
+ if ($result) {
+ push @testsFailed, $test;
</ins><span class="cx"> }
</span><del>- return 0;
</del><ins>+ if ($timedOut) {
+ push @testsTimedOut, $test;
+ print possiblyColored("bold yellow", "TIMEOUT"), " $test\n";
+ }
+
+ return $timedOut || $result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub listAllTests()
</span><span class="lines">@@ -257,45 +254,44 @@
</span><span class="cx"> $childErr = ">&DEVNULL";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- my @tests = ();
- foreach(testToolPaths()) {
- my $pid;
- my @commonArguments = ($_, "--gtest_list_tests");
- if (isIOSWebKit()) {
- $pid = open3($childIn, $childOut, $childErr, qw(xcrun -sdk iphonesimulator sim --environment=merge), @commonArguments) or die "Failed to build list of tests!";
- } elsif (isAppleMacWebKit() && architecture()) {
- $pid = open3($childIn, $childOut, $childErr, "arch", "-" . architecture(), @commonArguments) or die "Failed to build list of tests!";
- } else {
- $pid = open3($childIn, $childOut, $childErr, @commonArguments) or die "Failed to build list of tests!";
- }
</del><ins>+ my $pid;
+ my @commonArguments = (testToolPath(), "--gtest_list_tests");
+ if (isIOSWebKit()) {
+ $pid = open3($childIn, $childOut, $childErr, qw(xcrun -sdk iphonesimulator sim --environment=merge), @commonArguments) or die "Failed to build list of tests!";
+ } elsif (isAppleMacWebKit() && architecture()) {
+ $pid = open3($childIn, $childOut, $childErr, "arch", "-" . architecture(), @commonArguments) or die "Failed to build list of tests!";
+ } else {
+ $pid = open3($childIn, $childOut, $childErr, @commonArguments) or die "Failed to build list of tests!";
+ }
</ins><span class="cx">
</span><del>- close($childIn);
- @toolOutput = <$childOut>;
- close($childOut);
- close($childErr);
- close(DEVNULL) unless ($verbose);
</del><ins>+ close($childIn);
+ @toolOutput = <$childOut>;
+ close($childOut);
+ close($childErr);
+ close(DEVNULL) unless ($verbose);
</ins><span class="cx">
</span><del>- waitpid($pid, 0);
- my $result = $?;
</del><ins>+ waitpid($pid, 0);
+ my $result = $?;
</ins><span class="cx">
</span><del>- if ($result) {
- print STDERR "Failed to build list of tests!--\n";
- exit exitStatus($result);
- }
</del><ins>+ if ($result) {
+ print STDERR "Failed to build list of tests!\n";
+ exit exitStatus($result);
+ }
</ins><span class="cx">
</span><del>- my $suite;
- for my $line (@toolOutput) {
- $line =~ s/[\r\n]*$//;
- if ($line =~ m/\.$/) {
- $suite = $line; # "SuiteName."
- } else {
- # Disabling WebKit2 API test on Windows since we will be disabling WebKit2 on Windows.
- next if (isAppleWinWebKit() && $suite =~ m/WebKit2*/);
- $line =~ s/^\s*//; # "TestName"
- push @tests, $suite . $line; # "SuiteName.TestName"
- }
</del><ins>+ my @tests = ();
+ my $suite;
+ for my $line (@toolOutput) {
+ $line =~ s/[\r\n]*$//;
+ if ($line =~ m/\.$/) {
+ $suite = $line; # "SuiteName."
+ } else {
+ # Disabling WebKit2 API test on Windows since we will be disabling WebKit2 on Windows.
+ next if (isAppleWinWebKit() && $suite =~ m/WebKit2*/);
+ $line =~ s/^\s*//; # "TestName"
+ push @tests, $suite . $line; # "SuiteName.TestName"
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return @tests;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -347,20 +343,16 @@
</span><span class="cx"> setupMacWebKitEnvironment(productDir());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub testToolPaths()
</del><ins>+sub testToolPath()
</ins><span class="cx"> {
</span><span class="cx"> my $path = File::Spec->catfile(productDir(), "TestWebKitAPI");
</span><del>- return ($path) unless isAppleWinWebKit();
</del><ins>+ return $path unless isAppleWinWebKit();
</ins><span class="cx">
</span><del>- my $pathWTF = File::Spec->catfile(productDir(), "TestWTF");
- my $pathWebCore = File::Spec->catfile(productDir(), "TestWebCore");
- my $pathWebKit = File::Spec->catfile(productDir(), "TestWebKit");
-
</del><span class="cx"> my $suffix;
</span><span class="cx"> if (configuration() eq "Debug_All") {
</span><span class="cx"> $suffix = "_debug";
</span><span class="cx"> } else {
</span><span class="cx"> $suffix = "";
</span><span class="cx"> }
</span><del>- return ("$pathWTF$suffix.exe", "$pathWebCore$suffix.exe", "$pathWebKit$suffix.exe");
</del><ins>+ return "$path$suffix.exe";
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (189881 => 189882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2015-09-16 23:01:09 UTC (rev 189881)
+++ trunk/Tools/Scripts/webkitdirs.pm 2015-09-16 23:05:47 UTC (rev 189882)
</span><span class="lines">@@ -1723,7 +1723,7 @@
</span><span class="cx">
</span><span class="cx"> sub jhbuildWrapperPrefixIfNeeded()
</span><span class="cx"> {
</span><del>- if (isWindows() || isCygwin()) {
</del><ins>+ if (isWindows()) {
</ins><span class="cx"> return ();
</span><span class="cx"> }
</span><span class="cx"> if (-e getJhbuildPath()) {
</span><span class="lines">@@ -1859,8 +1859,7 @@
</span><span class="cx"> push @args, @cmakeArgs if @cmakeArgs;
</span><span class="cx"> push @args, $additionalCMakeArgs if $additionalCMakeArgs;
</span><span class="cx">
</span><del>- my $cmakeSourceDir = isCygwin() ? windowsSourceDir() : sourceDir();
- push @args, '"' . $cmakeSourceDir . '"';
</del><ins>+ push @args, '"' . sourceDir() . '"';
</ins><span class="cx">
</span><span class="cx"> # Compiler options to keep floating point values consistent
</span><span class="cx"> # between 32-bit and 64-bit architectures.
</span></span></pre>
</div>
</div>
</body>
</html>