Fix testing Makefile to inherit preprocessor definitions
authorkeith_miller@apple.com <keith_miller@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 8 Jan 2020 21:18:42 +0000 (21:18 +0000)
committerkeith_miller@apple.com <keith_miller@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 8 Jan 2020 21:18:42 +0000 (21:18 +0000)
https://bugs.webkit.org/show_bug.cgi?id=205940

Reviewed by Mark Lam.

.:

* Makefile.shared:

Tools:

* Makefile:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254219 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Makefile.shared
Tools/ChangeLog
Tools/Makefile

index 93b718f..3247ab2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2020-01-08  Keith Miller  <keith_miller@apple.com>
+
+        Fix testing Makefile to inherit preprocessor definitions
+        https://bugs.webkit.org/show_bug.cgi?id=205940
+
+        Reviewed by Mark Lam.
+
+        * Makefile.shared:
+
 2020-01-07  Keith Miller  <keith_miller@apple.com>
 
         Add a testing target to make that is release + assertions
index 7a3e9c6..80575e5 100644 (file)
@@ -103,7 +103,7 @@ release r deployment dep deploy: force
 
 testing t: 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" | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
+       ( $(SET_COLOR_DIAGNOSTICS_ARG); xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) GCC_PREPROCESSOR_DEFINITIONS='ASSERT_ENABLED=1 $$(inherited)' | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
 
 analyze:
        $(SCRIPTS_PATH)/set-webkit-configuration --debug $(ASAN_OPTION) $(WK_LTO_OPTION)
index e85fa13..57da5f4 100644 (file)
@@ -1,3 +1,12 @@
+2020-01-08  Keith Miller  <keith_miller@apple.com>
+
+        Fix testing Makefile to inherit preprocessor definitions
+        https://bugs.webkit.org/show_bug.cgi?id=205940
+
+        Reviewed by Mark Lam.
+
+        * Makefile:
+
 2020-01-08  Paulo Matos  <pmatos@igalia.com>
 
         Allow multiple cmakeargs inside inside envvar
index 696ce16..874ce2a 100644 (file)
@@ -34,7 +34,7 @@ release r deployment dep deploy:
 
 testing t:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
 analyze:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \