Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
8246484: Verify patch at start of COMPARE_BUILD=PATCH run
Reviewed-by: erikj
  • Loading branch information
magicus committed Jun 6, 2020
1 parent cd651b9 commit 2625942c43c31ee17256234a7d10a6d82fb911ce
Showing with 4 additions and 0 deletions.
  1. +4 −0 make/InitSupport.gmk
@@ -372,6 +372,10 @@ else # $(HAS_SPEC)=true
else ifeq ($$(wildcard $$(COMPARE_BUILD_PATCH)), )
$$(error Patch file $$(COMPARE_BUILD_PATCH) does not exist)
endif
PATCH_DRY_RUN := $$(shell cd $$(topdir) && $$(PATCH) --dry-run -p1 < $$(COMPARE_BUILD_PATCH) > /dev/null 2>&1 || $$(ECHO) FAILED)
ifeq ($$(PATCH_DRY_RUN), FAILED)
$$(error Patch file $$(COMPARE_BUILD_PATCH) does not apply cleanly)
endif
endif
ifneq ($$(COMPARE_BUILD_FAIL), true)
COMPARE_BUILD_IGNORE_RESULT := || true

0 comments on commit 2625942

Please sign in to comment.