Title: [282815] trunk/Tools
Revision
282815
Author
[email protected]
Date
2021-09-21 07:54:39 -0700 (Tue, 21 Sep 2021)

Log Message

Fix JSC test runner warnings and errors on linux
https://bugs.webkit.org/show_bug.cgi?id=230218

Patch by Phillip Mates <[email protected]> on 2021-09-21
Reviewed by Jonathan Bedard.

Fixed the following warning that arises in many scripts when they are
run on Linux:
`Can't exec "xcodebuild": No such file or directory at
/home/mates/igalia/WebKit/Tools/Scripts/webkitdirs.pm line 634.`

Fixed `run-_javascript_core-tests` on Linux, which was failing to invoke
builds before running the test suite with the error:
`Unrecognized option `--64-bit'`

* Scripts/webkitdirs.pm:
(XcodeOptions):
(determineIsWin64):
(determineIsWin64FromArchitecture): Deleted.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (282814 => 282815)


--- trunk/Tools/ChangeLog	2021-09-21 14:54:01 UTC (rev 282814)
+++ trunk/Tools/ChangeLog	2021-09-21 14:54:39 UTC (rev 282815)
@@ -1,3 +1,24 @@
+2021-09-21  Phillip Mates  <[email protected]>
+
+        Fix JSC test runner warnings and errors on linux
+        https://bugs.webkit.org/show_bug.cgi?id=230218
+
+        Reviewed by Jonathan Bedard.
+
+        Fixed the following warning that arises in many scripts when they are
+        run on Linux:
+        `Can't exec "xcodebuild": No such file or directory at
+        /home/mates/igalia/WebKit/Tools/Scripts/webkitdirs.pm line 634.`
+
+        Fixed `run-_javascript_core-tests` on Linux, which was failing to invoke
+        builds before running the test suite with the error:
+        `Unrecognized option `--64-bit'`
+
+        * Scripts/webkitdirs.pm:
+        (XcodeOptions):
+        (determineIsWin64):
+        (determineIsWin64FromArchitecture): Deleted.
+
 2021-09-21  Carlos Garcia Campos  <[email protected]>
 
         [webkitcorepy] Fail to parse python required version when there's a space between operator and version

Modified: trunk/Tools/Scripts/webkitdirs.pm (282814 => 282815)


--- trunk/Tools/Scripts/webkitdirs.pm	2021-09-21 14:54:01 UTC (rev 282814)
+++ trunk/Tools/Scripts/webkitdirs.pm	2021-09-21 14:54:39 UTC (rev 282815)
@@ -1008,7 +1008,9 @@
     determineForceOptimizationLevel();
     determineCoverageIsEnabled();
     determineLTOMode();
-    determineXcodeSDK();
+    if (isAppleCocoaWebKit()) {
+      determineXcodeSDK();
+    }
 
     my @options;
     push @options, "-UseSanitizedBuildSystemEnvironment=YES";
@@ -1480,16 +1482,9 @@
 sub determineIsWin64()
 {
     return if defined($isWin64);
-    $isWin64 = checkForArgumentAndRemoveFromARGV("--64-bit") || ((isAnyWindows() || isJSCOnly()) && !shouldBuild32Bit());
+    $isWin64 = checkForArgumentAndRemoveFromARGV("--64-bit") || (isAnyWindows() && !shouldBuild32Bit());
 }
 
-sub determineIsWin64FromArchitecture($)
-{
-    my $arch = shift;
-    $isWin64 = ($arch eq "x86_64");
-    return $isWin64;
-}
-
 sub isCygwin()
 {
     return ($^O eq "cygwin") || 0;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to