Changeset 53783 in webkit
- Timestamp:
- Jan 24, 2010 2:15:29 PM (14 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r53778 r53783 1 2010-01-24 Eric Seidel <eric@webkit.org> 2 3 No review, rolling out r53763. 4 http://trac.webkit.org/changeset/53763 5 https://bugs.webkit.org/show_bug.cgi?id=33895 6 7 Broke 20+ tests on Windows. 8 9 * Scripts/run-webkit-tests: 10 * Scripts/webkitdirs.pm: 11 1 12 2010-01-24 Adam Barth <abarth@webkit.org> 2 13 -
trunk/WebKitTools/Scripts/run-webkit-tests
r53763 r53783 88 88 sub htmlForResultsSection(\@$&); 89 89 sub isTextOnlyTest($); 90 sub launchWith Env(\@\%);90 sub launchWithCurrentEnv(@); 91 91 sub resolveAndMakeTestResultsDirectory(); 92 92 sub numericcmp($$); … … 660 660 $testPath = canonpath($testPath); 661 661 } 662 print OUT "$testPath$suffixExpectedHash\n" if defined $testPath;662 print OUT "$testPath$suffixExpectedHash\n"; 663 663 } 664 664 … … 1028 1028 } elsif (isQt()) { 1029 1029 unshift @configurationArgs, qw(-graphicssystem raster -style windows); 1030 if (isCygwin()) {1031 $testResults = "/" . toWindowsPath($testResults);1032 $testResults =~ s/\\/\//g;1033 }1034 1030 system "WebKitTools/Scripts/run-launcher", @configurationArgs, "file://".$testResults if $launchSafari; 1035 1031 } elsif (isCygwin()) { … … 1215 1211 } 1216 1212 1217 sub launchWith Env(\@\%)1218 { 1219 my ( $args, $env) = @_;1213 sub launchWithCurrentEnv(@) 1214 { 1215 my (@args) = @_; 1220 1216 1221 1217 # Dump the current environment as perl code and then put it in quotes so it is one parameter. 1222 my $environmentDumper = Data::Dumper->new([\% {$env}], [qw(*ENV)]);1218 my $environmentDumper = Data::Dumper->new([\%ENV], [qw(*ENV)]); 1223 1219 $environmentDumper->Indent(0); 1224 1220 $environmentDumper->Purity(1); 1225 1221 my $allEnvVars = $environmentDumper->Dump(); 1226 unshift @ {$args}, "\"$allEnvVars\"";1222 unshift @args, "\"$allEnvVars\""; 1227 1223 1228 1224 my $execScript = File::Spec->catfile(sourceDir(), qw(WebKitTools Scripts execAppWithEnv)); 1229 unshift @ {$args}, $execScript;1230 return @ {$args};1225 unshift @args, $execScript; 1226 return @args; 1231 1227 } 1232 1228 … … 1243 1239 return if !$pixelTests; 1244 1240 1245 my %CLEAN_ENV; 1246 $CLEAN_ENV{MallocStackLogging} = 1 if $shouldCheckLeaks; 1247 $imageDiffToolPID = open2(\*DIFFIN, \*DIFFOUT, $imageDiffTool, launchWithEnv(@diffToolArgs, %CLEAN_ENV)) or die "unable to open $imageDiffTool\n"; 1241 local %ENV; 1242 $ENV{MallocStackLogging} = 1 if $shouldCheckLeaks; 1243 $imageDiffToolPID = open2(\*DIFFIN, \*DIFFOUT, $imageDiffTool, launchWithCurrentEnv(@diffToolArgs)) or die "unable to open $imageDiffTool\n"; 1244 $ENV{MallocStackLogging} = 0 if $shouldCheckLeaks; 1248 1245 $isDiffToolOpen = 1; 1249 1246 } … … 1253 1250 return if $isDumpToolOpen; 1254 1251 1255 my %CLEAN_ENV; 1256 1257 # Generic environment variables 1258 $CLEAN_ENV{XML_CATALOG_FILES} = ""; # work around missing /etc/catalog <rdar://problem/4292995> 1259 1260 # Platform spesifics 1261 if (isLinux()) { 1262 if (defined $ENV{'DISPLAY'}) { 1263 $CLEAN_ENV{DISPLAY} = $ENV{'DISPLAY'}; 1252 # Save environment variables required for the linux environment. 1253 my $homeDir = $ENV{'HOME'}; 1254 my $libraryPath = $ENV{'LD_LIBRARY_PATH'}; 1255 my $dyldLibraryPath = $ENV{'DYLD_LIBRARY_PATH'}; 1256 my $dbusAddress = $ENV{'DBUS_SESSION_BUS_ADDRESS'}; 1257 my $display = $ENV{'DISPLAY'}; 1258 my $xauthority = $ENV{'XAUTHORITY'}; 1259 my $testfonts = $ENV{'WEBKIT_TESTFONTS'}; 1260 1261 my $homeDrive = $ENV{'HOMEDRIVE'}; 1262 my $homePath = $ENV{'HOMEPATH'}; 1263 1264 local %ENV; 1265 if (isQt() || isGtk()) { 1266 if (defined $display) { 1267 $ENV{DISPLAY} = $display; 1264 1268 } else { 1265 $CLEAN_ENV{DISPLAY} = ":1"; 1266 } 1267 if (defined $ENV{'XAUTHORITY'}) { 1268 $CLEAN_ENV{XAUTHORITY} = $ENV{'XAUTHORITY'}; 1269 } 1270 1271 if (defined $ENV{'WEBKIT_TESTFONTS'}) { 1272 $CLEAN_ENV{WEBKIT_TESTFONTS} = $ENV{'WEBKIT_TESTFONTS'}; 1273 } 1274 1275 $CLEAN_ENV{HOME} = $ENV{'HOME'}; 1276 if (defined $ENV{'LD_LIBRARY_PATH'}) { 1277 $CLEAN_ENV{LD_LIBRARY_PATH} = $ENV{'LD_LIBRARY_PATH'}; 1278 } 1279 if (defined $ENV{'DBUS_SESSION_BUS_ADDRESS'}) { 1280 $CLEAN_ENV{DBUS_SESSION_BUS_ADDRESS} = $ENV{'DBUS_SESSION_BUS_ADDRESS'}; 1281 } 1282 } elsif (isDarwin()) { 1283 if (defined $ENV{'DYLD_LIBRARY_PATH'}) { 1284 $CLEAN_ENV{DYLD_LIBRARY_PATH} = $ENV{'DYLD_LIBRARY_PATH'}; 1285 } 1286 1287 $CLEAN_ENV{DYLD_FRAMEWORK_PATH} = $productDir; 1288 $CLEAN_ENV{DYLD_INSERT_LIBRARIES} = "/usr/lib/libgmalloc.dylib" if $guardMalloc; 1289 } elsif (isCygwin()) { 1290 $CLEAN_ENV{HOMEDRIVE} = $ENV{'HOMEDRIVE'}; 1291 $CLEAN_ENV{HOMEPATH} = $ENV{'HOMEPATH'}; 1292 1293 setPathForRunningWebKitApp(\%CLEAN_ENV); 1294 } 1295 1296 # Port spesifics 1269 $ENV{DISPLAY} = ":1"; 1270 } 1271 if (defined $xauthority) { 1272 $ENV{XAUTHORITY} = $xauthority; 1273 } 1274 $ENV{'WEBKIT_TESTFONTS'} = $testfonts if defined($testfonts); 1275 $ENV{HOME} = $homeDir; 1276 if (defined $libraryPath) { 1277 $ENV{LD_LIBRARY_PATH} = $libraryPath; 1278 } 1279 if (defined $dyldLibraryPath) { 1280 $ENV{DYLD_LIBRARY_PATH} = $dyldLibraryPath; 1281 } 1282 if (defined $dbusAddress) { 1283 $ENV{DBUS_SESSION_BUS_ADDRESS} = $dbusAddress; 1284 } 1285 } 1297 1286 if (isQt()) { 1298 $CLEAN_ENV{QTWEBKIT_PLUGIN_PATH} = productDir() . "/lib/plugins"; 1299 } 1287 $ENV{QTWEBKIT_PLUGIN_PATH} = productDir() . "/lib/plugins"; 1288 } 1289 $ENV{DYLD_FRAMEWORK_PATH} = $productDir; 1290 $ENV{XML_CATALOG_FILES} = ""; # work around missing /etc/catalog <rdar://problem/4292995> 1291 $ENV{DYLD_INSERT_LIBRARIES} = "/usr/lib/libgmalloc.dylib" if $guardMalloc; 1300 1292 1293 if (isCygwin()) { 1294 $ENV{HOMEDRIVE} = $homeDrive; 1295 $ENV{HOMEPATH} = $homePath; 1296 if ($testfonts) { 1297 $ENV{WEBKIT_TESTFONTS} = $testfonts; 1298 } 1299 setPathForRunningWebKitApp(\%ENV) if isCygwin(); 1300 } 1301 1301 1302 my @args = ($dumpTool, @toolArgs); 1302 1303 if (isAppleMacWebKit() and !isTiger()) { … … 1307 1308 unshift @args, "valgrind", "--suppressions=$platformBaseDirectory/qt/SuppressedValgrindErrors"; 1308 1309 } 1309 1310 $CLEAN_ENV{MallocStackLogging} = 1 if $shouldCheckLeaks; 1311 1312 $dumpToolPID = open3(\*OUT, \*IN, \*ERROR, launchWithEnv(@args, %CLEAN_ENV)) or die "Failed to start tool: $dumpTool\n"; 1313 if (isCygwin()) { 1314 # Convert '\r\n' => '\n', to match the expected files 1315 binmode(IN, ":crlf"); 1316 binmode(ERROR, ":crlf"); 1317 } 1310 1311 $ENV{MallocStackLogging} = 1 if $shouldCheckLeaks; 1312 $dumpToolPID = open3(\*OUT, \*IN, \*ERROR, launchWithCurrentEnv(@args)) or die "Failed to start tool: $dumpTool\n"; 1313 $ENV{MallocStackLogging} = 0 if $shouldCheckLeaks; 1318 1314 $isDumpToolOpen = 1; 1319 1315 $dumpToolCrashed = 0; … … 1342 1338 return 1 if $dumpToolCrashed; 1343 1339 return 0 unless $isDumpToolOpen; 1340 1344 1341 my $pid = waitpid(-1, WNOHANG); 1345 1342 return 1 if ($pid == $dumpToolPID); … … 1621 1618 local *outFH = $cygpath->{"out"}; 1622 1619 print outFH $path . "\n"; 1623 my $convertedPath = <inFH>; 1624 chomp($convertedPath) if defined $convertedPath; 1620 chomp(my $convertedPath = <inFH>); 1625 1621 return $convertedPath; 1626 1622 } -
trunk/WebKitTools/Scripts/webkitdirs.pm
r53763 r53783 542 542 return "$configurationProductDir/lib/$libraryName.framework/$libraryName"; 543 543 } elsif (isWindows()) { 544 my $mkspec = `qmake -query QMAKE_MKSPECS`; 545 $mkspec =~ s/[\n|\r]$//g; 544 chomp(my $mkspec = `qmake -query QMAKE_MKSPECS`); 546 545 my $qtMajorVersion = retrieveQMakespecVar("$mkspec/qconfig.pri", "QT_MAJOR_VERSION"); 547 if ( not $qtMajorVersion) {546 if ($qtMajorVersion eq "unknown") { 548 547 $qtMajorVersion = ""; 549 548 } … … 1330 1329 my $varname = $_[1]; 1331 1330 1332 my $ varvalue = undef;1331 my $compiler = "unknown"; 1333 1332 #print "retrieveMakespecVar " . $mkspec . ", " . $varname . "\n"; 1334 1333 1335 1334 local *SPEC; 1336 open SPEC, "<$mkspec" or return $varvalue;1335 open SPEC, "<$mkspec" or return "make"; 1337 1336 while (<SPEC>) { 1338 1337 if ($_ =~ /\s*include\((.+)\)/) { … … 1342 1341 my $newcwd = "$volume$directories"; 1343 1342 chdir $newcwd if $newcwd; 1344 $ varvalue= retrieveQMakespecVar($1, $varname);1343 $compiler = retrieveQMakespecVar($1, $varname); 1345 1344 chdir $oldcwd; 1346 1345 } elsif ($_ =~ /$varname\s*=\s*([^\s]+)/) { 1347 $ varvalue= $1;1346 $compiler = $1; 1348 1347 last; 1349 1348 } 1350 1349 } 1351 1350 close SPEC; 1352 return $ varvalue;1351 return $compiler; 1353 1352 } 1354 1353 … … 1647 1646 my ($env) = @_; 1648 1647 1649 if (isAppleWinWebKit()) { 1650 $env->{PATH} = join(':', productDir(), dirname(installedSafariPath()), appleApplicationSupportPath(), $env->{PATH} || ""); 1651 } elsif (isQt()) { 1652 my $qtLibs = `qmake -query QT_INSTALL_LIBS`; 1653 $qtLibs =~ s/[\n|\r]$//g; 1654 $env->{PATH} = join(';', $qtLibs, productDir() . "/lib", $env->{PATH} || ""); 1655 } 1648 return unless isAppleWinWebKit(); 1649 1650 $env->{PATH} = join(':', productDir(), dirname(installedSafariPath()), appleApplicationSupportPath(), $env->{PATH} || ""); 1656 1651 } 1657 1652
Note: See TracChangeset
for help on using the changeset viewer.