Changeset 254227 in webkit

Timestamp:

Jan 8, 2020 2:20:24 PM (4 years ago)

Author:

mark.lam@apple.com

Message:

Rename testing build configuration to release+assert, and add new testing build configuration.
​https://bugs.webkit.org/show_bug.cgi?id=205954

Reviewed by Yusuke Suzuki.

.:

"make release-assert" builds a release build with ASSERT_ENABLED=1.
"make testing" builds a debug build with clang optimization level forced to -O3.

• Makefile:
• Makefile.shared:
• Source/Makefile:

Source/ThirdParty:

• Makefile:

Tools:

Added a --force-opt shortcut for the --force-optimization-level option of
set-webkit-configuration. This makes it less painful to type this on the command
line for those of us who would like to use this option often in our local builds.

• Makefile:
• Scripts/set-webkit-configuration:

WebKitLibraries:

• Makefile:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Makefile (modified) (1 diff)
• Makefile.shared (modified) (1 diff)
• Source/Makefile (modified) (1 diff)
• Source/ThirdParty/ChangeLog (modified) (1 diff)
• Source/ThirdParty/Makefile (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Makefile (modified) (1 diff)
• Tools/Scripts/set-webkit-configuration (modified) (1 diff)
• WebKitLibraries/ChangeLog (modified) (1 diff)
• WebKitLibraries/Makefile (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2020-01-08  Mark Lam  <mark.lam@apple.com>
+
+        Rename testing build configuration to release+assert, and add new testing build configuration.
+        https://bugs.webkit.org/show_bug.cgi?id=205954
+
+        Reviewed by Yusuke Suzuki.
+
+        "make release-assert" builds a release build with ASSERT_ENABLED=1.
+        "make testing" builds a debug build with clang optimization level forced to -O3.
+
+        * Makefile:
+        * Makefile.shared:
+        * Source/Makefile:
+
 2020-01-08  Keith Miller  <keith_miller@apple.com>
 

trunk/Makefile

@@ -13 +13 @@
         if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
+release+assert ra:
+        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+
 testing t:
         @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \

trunk/Makefile.shared

@@ -102 +102 @@
         ( $(SET_COLOR_DIAGNOSTICS_ARG); xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
 
-testing t: force
+release+assert ra: force
         $(SCRIPTS_PATH)/set-webkit-configuration --release $(ASAN_OPTION) $(WK_LTO_OPTION)
         ( $(SET_COLOR_DIAGNOSTICS_ARG); xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) GCC_PREPROCESSOR_DEFINITIONS='ASSERT_ENABLED=1 $$(inherited)' | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
+
+testing t: force
+        $(SCRIPTS_PATH)/set-webkit-configuration --debug $(ASAN_OPTION) $(WK_LTO_OPTION) --force-optimization-level=O3
+        ( $(SET_COLOR_DIAGNOSTICS_ARG); xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
 
 analyze:

trunk/Source/Makefile

@@ -23 +23 @@
         if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
+release+assert ra:
+        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+
 testing t:
         @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \

trunk/Source/ThirdParty/ChangeLog

@@ +1 @@
+2020-01-08  Mark Lam  <mark.lam@apple.com>
+
+        Rename testing build configuration to release+assert, and add new testing build configuration.
+        https://bugs.webkit.org/show_bug.cgi?id=205954
+
+        Reviewed by Yusuke Suzuki.
+
+        * Makefile:
+
 2020-01-07  Keith Miller  <keith_miller@apple.com>
 

trunk/Source/ThirdParty/Makefile

@@ -37 +37 @@
         if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
+release+assert ra:
+        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+
 testing t:
         @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \

trunk/Tools/ChangeLog

@@ +1 @@
+2020-01-08  Mark Lam  <mark.lam@apple.com>
+
+        Rename testing build configuration to release+assert, and add new testing build configuration.
+        https://bugs.webkit.org/show_bug.cgi?id=205954
+
+        Reviewed by Yusuke Suzuki.
+
+        Added a --force-opt shortcut for the --force-optimization-level option of
+        set-webkit-configuration.  This makes it less painful to type this on the command
+        line for those of us who would like to use this option often in our local builds.
+
+        * Makefile:
+        * Scripts/set-webkit-configuration:
+
 2020-01-08  Matt Lewis  <jlewis3@apple.com>
 

trunk/Tools/Makefile

@@ -33 +33 @@
         if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
+release+assert ra:
+        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+
 testing t:
         @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \

trunk/Tools/Scripts/set-webkit-configuration

@@ -55 +55 @@
 }
 my $forceOptimizationLevel;
-if (!checkForArgumentAndRemoveFromARGVGettingValue("--force-optimization-level", \$forceOptimizationLevel)) {
+if (!checkForArgumentAndRemoveFromARGVGettingValue("--force-optimization-level", \$forceOptimizationLevel)
+    && !checkForArgumentAndRemoveFromARGVGettingValue("--force-opt", \$forceOptimizationLevel)) {
     $forceOptimizationLevel="";
 }

trunk/WebKitLibraries/ChangeLog

@@ +1 @@
+2020-01-08  Mark Lam  <mark.lam@apple.com>
+
+        Rename testing build configuration to release+assert, and add new testing build configuration.
+        https://bugs.webkit.org/show_bug.cgi?id=205954
+
+        Reviewed by Yusuke Suzuki.
+
+        * Makefile:
+
 2020-01-07  Keith Miller  <keith_miller@apple.com>
 

trunk/WebKitLibraries/Makefile

@@ -23 +23 @@
         @$(MAKE) libs
 
+release+assert ra:
+        $(SCRIPTS_PATH)/set-webkit-configuration --release
+        @$(MAKE) libs
+
 testing t:
-        $(SCRIPTS_PATH)/set-webkit-configuration --release
+        $(SCRIPTS_PATH)/set-webkit-configuration --debug --force-optimization-level=O3
         @$(MAKE) libs