Changeset 275534 in webkit

Timestamp:

Apr 6, 2021 11:02:25 AM (3 years ago)

Author:

ddkilzer@apple.com

Message:

set-webkit-configuration should print current settings
<​https://webkit.org/b/224190>

Reviewed by Mark Lam.

• Scripts/set-webkit-configuration:
• Reorder switches to put sanitizers together.
• Declare subroutines.
• Call printCurrentSettings() or printUsage() as needed.

(printCurrentSettings): Add.
(printUsage): Add.

• Scripts/webkitdirs.pm:
• Reorder switch variables to match other code.

(coverageIsEnabled): Add for set-webkit-configuration.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/set-webkit-configuration (modified) (7 diffs)
• Scripts/webkitdirs.pm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-04-06  David Kilzer  <ddkilzer@apple.com>
+
+        set-webkit-configuration should print current settings
+        <https://webkit.org/b/224190>
+
+        Reviewed by Mark Lam.
+
+        * Scripts/set-webkit-configuration:
+        - Reorder switches to put sanitizers together.
+        - Declare subroutines.
+        - Call printCurrentSettings() or printUsage() as needed.
+        (printCurrentSettings): Add.
+        (printUsage): Add.
+        * Scripts/webkitdirs.pm:
+        - Reorder switch variables to match other code.
+        (coverageIsEnabled): Add for set-webkit-configuration.
+
 2021-04-06  Philippe Normand  <pnormand@igalia.com>
 

trunk/Tools/Scripts/set-webkit-configuration

@@ -40 +40 @@
   --64-bit                           Set the default architecture to 64-bit
   --[no-]asan                        Enable or disable clang address sanitizer
-  --[no-]coverage                    Enable or disable LLVM Source-based Code Coverage
   --[no-]tsan                        Enable or disable clang thread sanitizer
   --[no-]ubsan                       Enable or disable clang undefined behavior sanitizer
+  --[no-]coverage                    Enable or disable LLVM Source-based Code Coverage
   --force-optimization-level=<level> Optimization level: O3, O2, O1, O0, Os, Ofast, Og, or none
   --lto-mode=<mode>                  Set LTO mode: full, thin, or none
@@ -50 +50 @@
 EOF
 
+sub printCurrentSettings();
+sub printUsage();
+sub updateOrDeleteConfigurationFile($$);
+
 my $configuration = passedConfiguration();
 my $architecture = passedArchitecture();
 my $enableASAN = checkForArgumentAndRemoveFromARGV("--asan");
 my $disableASAN = checkForArgumentAndRemoveFromARGV("--no-asan");
-my $enableCoverage = checkForArgumentAndRemoveFromARGV("--coverage");
-my $disableCoverage = checkForArgumentAndRemoveFromARGV("--no-coverage");
 my $enableTSAN = checkForArgumentAndRemoveFromARGV("--tsan");
 my $disableTSAN = checkForArgumentAndRemoveFromARGV("--no-tsan");
 my $enableUBSAN = checkForArgumentAndRemoveFromARGV("--ubsan");
 my $disableUBSAN = checkForArgumentAndRemoveFromARGV("--no-ubsan");
+my $enableCoverage = checkForArgumentAndRemoveFromARGV("--coverage");
+my $disableCoverage = checkForArgumentAndRemoveFromARGV("--no-coverage");
 my $ltoMode;
 if (!checkForArgumentAndRemoveFromARGVGettingValue("--lto-mode", \$ltoMode)) {
@@ -88 +92 @@
         unlink File::Spec->catfile($baseProductDir, $fileName);
     }
+    printCurrentSettings();
     exit 0;
 }
@@ -97 +102 @@
     || ($enableUBSAN && $disableUBSAN)
     ) {
-    print STDERR $usage;
+    printUsage();
     exit 1;
 }
@@ -103 +108 @@
 if ($enableASAN && $enableTSAN) {
     print STDERR "ERROR: Address Sanitizer and Thread Sanitzer can't be enabled together.\n";
-    print STDERR $usage;
+    printUsage();
     exit 1;
 }
 
 if ($ltoMode && $ltoMode ne "full" && $ltoMode ne "thin" && $ltoMode ne "none") {
-    print STDERR $usage;
+    printUsage();
     exit 1;
 }
@@ -121 +126 @@
     && $forceOptimizationLevel ne "Ofast"
     && $forceOptimizationLevel ne "Og") {
-    print STDERR $usage;
+    printUsage();
     exit 1;
 }
@@ -172 +177 @@
     close LTO;
 }
+
+printCurrentSettings();
+
+exit 0;
+
+sub printCurrentSettings()
+{
+    my $result = "Current settings:";
+    $result .= " Configuration:" . configuration();
+    $result .= " Arch:" . architecture() if architecture();
+    $result .= " ASan" if asanIsEnabled();
+    $result .= " TSan" if tsanIsEnabled();
+    $result .= " UBSan" if ubsanIsEnabled();
+    $result .= " Coverage" if coverageIsEnabled();
+    $result .= " LTOMode:" . ltoMode() if ltoMode();
+    $result .= " ForceOptimizationLevel:O" . forceOptimizationLevel() if forceOptimizationLevel();
+
+    print STDERR $result, "\n";
+}
+
+sub printUsage()
+{
+    print STDERR $usage, "\n";
+    printCurrentSettings();
+}

trunk/Tools/Scripts/webkitdirs.pm

@@ -133 +133 @@
 my $tsanIsEnabled;
 my $ubsanIsEnabled;
+my $coverageIsEnabled;
 my $forceOptimizationLevel;
-my $coverageIsEnabled;
 my $ltoMode;
 my $numberOfCPUs;
@@ -936 +936 @@
 }
 
+sub coverageIsEnabled()
+{
+    determineCoverageIsEnabled();
+    return $coverageIsEnabled;
+}
+
 sub forceOptimizationLevel()
 {