Changeset 275686 in webkit

Timestamp:

Apr 8, 2021, 4:04:46 PM (4 years ago)

Author:

ddkilzer@apple.com

Message:

REGRESSION (r275150): set-webkit-configuration is too aggressive at deleting config files when coverage/sanitizer switch is not set
<​https://webkit.org/b/224343>

Reviewed by Mark Lam.

• Scripts/set-webkit-configuration:

(updateOrDeleteConfigurationFile):

• Change to take enabled and disabled arguments, and only reset (unlink) a config file if the --no-<option> is explicitly set.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/set-webkit-configuration (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-04-08  David Kilzer  <ddkilzer@apple.com>
+
+        REGRESSION (r275150): set-webkit-configuration is too aggressive at deleting config files when coverage/sanitizer switch is not set
+        <https://webkit.org/b/224343>
+
+        Reviewed by Mark Lam.
+
+        * Scripts/set-webkit-configuration:
+        (updateOrDeleteConfigurationFile):
+        - Change to take enabled and disabled arguments, and only
+          reset (unlink) a config file if the --no-<option> is
+          explicitly set.
+
 2021-04-08  Kate Cheney  <katherine_cheney@apple.com>
 

trunk/Tools/Scripts/set-webkit-configuration

@@ -52 +52 @@
 sub printCurrentSettings();
 sub printUsage();
-sub updateOrDeleteConfigurationFile($$);
+sub updateOrDeleteConfigurationFile($$$);
 
 my $configuration = passedConfiguration();
@@ -130 +130 @@
 }
 
-sub updateOrDeleteConfigurationFile($$)
-{
-    my ($fileName, $contents) = @_;
-    my $filePath = File::Spec->catfile($baseProductDir, $fileName);
-    if ($contents) {
-       open FILE, ">", $filePath or die;
-       print FILE $contents;
-       close FILE;
-    } else {
-        unlink $filePath;
-    }
-}
-
 if ($configuration) {
     open CONFIGURATION, ">", "$baseProductDir/Configuration" or die;
@@ -159 +146 @@
 }
 
-updateOrDeleteConfigurationFile("ASan", $enableASAN ? "YES" : undef);
-updateOrDeleteConfigurationFile("Coverage", $enableCoverage ? "YES" : undef);
-updateOrDeleteConfigurationFile("TSan", $enableTSAN ? "YES" : undef);
-updateOrDeleteConfigurationFile("UBSan", $enableUBSAN ? "YES" : undef);
+updateOrDeleteConfigurationFile("ASan", $enableASAN, $disableASAN);
+updateOrDeleteConfigurationFile("Coverage", $enableCoverage, $disableCoverage);
+updateOrDeleteConfigurationFile("TSan", $enableTSAN, $disableTSAN);
+updateOrDeleteConfigurationFile("UBSan", $enableUBSAN, $disableUBSAN);
 
 if ($forceOptimizationLevel && $forceOptimizationLevel eq "none") {
@@ -202 +189 @@
     printCurrentSettings();
 }
+
+sub updateOrDeleteConfigurationFile($$$)
+{
+    my ($fileName, $shouldEnable, $shouldDisable) = @_;
+    my $filePath = File::Spec->catfile($baseProductDir, $fileName);
+    if ($shouldEnable) {
+       open FILE, ">", $filePath or die;
+       print FILE "YES";
+       close FILE;
+    } elsif ($shouldDisable) {
+        unlink $filePath;
+    }
+}