[PATCH] --ignore_optional_include ignores non-matching include files #54
Comments
B--B
pushed a commit
to AOSP-JF-MM/platform_build_kati
that referenced
this issue
Sep 24, 2016
* from http://review.cyanogenmod.org/#/c/163401/ Signed-off-by: Caio Oliveira <caiooliveirafarias0@gmail.com> Revert "[C++] Ignore white space around $(call) function name" This reverts commit c99f81d1b901a96acfb37bffd05ffeb1520db6e8. Revert "kati: Silence FindEmulator" This reverts commit 6fe70697bdaa0ee1a365178b416a4801654816de. Squashed merge from 'google/kati' commit 5e45e97 Merge: 2ef045a 5131f84 Author: Dan Willemsen <dan@danw.org> Date: Tue Sep 20 13:26:34 2016 -0700 Merge pull request #92 from danw/asan_workaround Workaround lifetime problem identified by ASAN commit 5131f84 Author: Dan Willemsen <dwillemsen@google.com> Date: Fri Sep 16 20:33:31 2016 -0700 Workaround lifetime problem identified by ASAN When we run ConcatDir in NinjaGenerator::GenerateStamp, we were hitting a container overflow from ASAN. When dumping the memory contents, it looked like the StringPiece's data was pointed to a corrupted piece of memory. Instead of tracking it down, just copy the strings upon creation. This is causing kati to take a few extra seconds on master (5% increase for a build that otherwise does nothing), so this should probably be investigated. Change-Id: I197e4a522dd32e5c5ed5e7a0c6659aa486dfdc94 commit 2ef045a Merge: 1abedff 40e5a3d Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Tue Sep 20 13:52:02 2016 +0900 Merge pull request #94 from danw/date_echo_no_ignore Don't ignore all date/echo commands commit 1abedff Author: hamaji <shinichiro.hamaji@gmail.com> Date: Tue Sep 20 13:02:28 2016 +0900 Stop using .PHONY as a build target in phony.mk This testcase makes little sense. commit fc689ae Merge: fa58b6f cac3d5a Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Tue Sep 20 13:00:51 2016 +0900 Merge pull request #93 from danw/ninja_special_targets ninja: Don't emit special targets (.*) commit fa58b6f Merge: 6d3dd63 f6486ce Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Tue Sep 20 12:49:16 2016 +0900 Merge pull request #91 from danw/regen_debug Add --regen_debug commit 6d3dd63 Merge: d26caad f2b88a5 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Tue Sep 20 12:41:18 2016 +0900 Merge pull request #90 from danw/unused_parameter_warning Fix unused parameter warning for !SSE4.2 commit 40e5a3d Author: Dan Willemsen <dwillemsen@google.com> Date: Fri Sep 16 19:35:32 2016 -0700 Don't ignore all date/echo commands echo commands may have side-effects (writing a file), or be testing a condition and echoing a different value. date commands may be part of a larger command as well. In any case, if the command changes, and would cause changes to the ninja file, then we want to regenerate the ninja file. Just whitelist `date +%s` for now, since Android uses that as its only build-time date source, and we don't want to rebuild the ninja file every time for that. Eventually, it should be removed, but that means removing all makefile choices on BUILD_NUMBER, since that depends on BUILD_DATETIME as well. In either case, the real value should never be inserted into the ninja file. Change-Id: I3b36c8b46f747c1b22a3faacf1fc34683faa9b70 commit cac3d5a Author: Dan Willemsen <dwillemsen@google.com> Date: Fri Sep 16 23:51:12 2016 -0700 ninja: Don't emit special targets (.*) These aren't meant to be called directly, so there's no point putting them in the ninja file. commit f6486ce Author: Dan Willemsen <dwillemsen@google.com> Date: Fri Sep 16 19:21:36 2016 -0700 Add --regen_debug This prints information about the regen process during a normal build, including which shell commands where rerun or ignored. My main goal is to understand if it's safe to remove our --ignore_dirty argument. So I need to understand which files were dirty, but ignored. And I'd also like to know which shell commands were run (or would be run if not ignored), to identify any that may cause side-effects (whether desired or not). It's different from --dump-kati-stamp, since --dump-kati-stamp stops kati before actually building anything, and continues after the first dirty indication in an attempt to find every difference. commit f2b88a5 Author: Dan Willemsen <dwillemsen@google.com> Date: Fri Sep 16 19:34:45 2016 -0700 Fix unused parameter warning for !SSE4.2 Change-Id: I7099c92120dde0d985bc9d19fe0b2573027e5d79 commit d26caad Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Thu Jun 30 17:41:04 2016 +0900 [C++] Remove code only for non-SSE environment Now SkipUntil works both with and without SSE. commit 6691a0b Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Thu Jun 30 17:08:18 2016 +0900 [C++] Do not use STTNI when string length is <16 commit da2a2a3 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Thu Jun 30 16:45:46 2016 +0900 [C++] Fix strutil_test for non-SSE build commit 8ca0f76 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Thu Jun 30 17:24:02 2016 +0900 [C++] Fix a typo in PR#48 commit 91420ec Merge: c4f7662 cd29d6c Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Thu Jun 30 17:23:43 2016 +0900 Merge pull request #84 from danw/invalid_string_access Add unit tests for invalid string accesses commit cd29d6c Author: Dan Willemsen <dwillemsen@google.com> Date: Wed Jun 29 23:21:20 2016 -0700 Add unit tests for invalid string accesses A string may be allocated at the end of a page, and the next page may not be readable, so reading beyond the null character may not be safe. We've hit this with real makefiles, but here's a directed test that can reproduce it in other environments. This also updates the travis config to run the unit tests. commit c4f7662 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Thu Jun 30 13:05:10 2016 +0900 [C++] Allow targets which start with `='. but with a kati-specific warning message. This fixes #83. commit dbd6b57 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Sat Jun 25 11:27:29 2016 +0900 Add Po Hu to AUTHORS/CONTRIBUTORS commit 8e77fa7 Merge: 52fe6fc 5e6b2e4 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Sat Jun 25 11:24:59 2016 +0900 Merge branch 'jzhupo-master' commit 5e6b2e4 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Sat Jun 25 11:24:11 2016 +0900 Add testcases for commandline variables commit 4627ab2 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Sat Jun 25 11:11:44 2016 +0900 [C++] A follow-up for the previous change commit d570f21 Author: Po Hu <hupo1985@gmail.com> Date: Sat Jun 25 09:08:54 2016 +0800 [C++] Allow pass command line variables from make to ckati They will be preserved in MAKEFLAGS as environment variable. TODO: Set MAKEFLAGS as file variable instead of environment. $ cat Makefile VAR := FAIL $(info VAR=$(VAR),$(origin VAR)) $(info MAKEFLAGS=$(MAKEFLAGS),$(origin MAKEFLAGS)) all: @ckati last last: @echo $@ $ make VAR=PASS VAR=PASS,command line MAKEFLAGS=,file VAR=PASS,command line MAKEFLAGS=VAR=PASS,environment last commit 6957e9a Author: Po Hu <hupo1985@gmail.com> Date: Fri Jun 24 20:05:43 2016 +0800 [C++] Allow command line variables to override file variables Test case: $ cat Makefile VAR := FAIL $(info $(VAR)) all: @echo $(VAR) $ ckati -f Makefile VAR=PASS PASS PASS commit 52fe6fc Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Thu Jun 9 16:14:51 2016 +0900 [C++] Do not evaluate recursive variable in ifdef This fixes #79 commit 3e98b6b Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Tue Jun 7 14:35:41 2016 +0900 [C++] Fix handling CRLF after a backslash This fixes #77 commit 71e7934 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Tue Jun 7 14:05:48 2016 +0900 [C++] Fix $(join) for #76 commit 42093cf Merge: 390115c 9f4c646 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Fri Jun 3 15:40:32 2016 +0900 Merge pull request #75 from stefanb2/topic-issue-74 [C++] $(eval) stops when first character is '#' commit 9f4c646 Author: Stefan Becker <stefanb@gpartner-nvidia.com> Date: Thu Jun 2 20:01:18 2016 +0300 [C++] $(eval) stops when first character is '#' Regression when compared to GNU make behaviour. Test case: $ cat ../Makefile.comment-in-macro .PHONY: all define _rule # comment all: : endef $(eval $(_rule)) $ make -f Makefile.comment-in-macro : $ ckati --ninja --ninja_dir . --gen_all_targets -f Makefile.comment-in-macro *** No targets. Fixes google/kati#74 commit 390115c Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Mon May 30 18:41:21 2016 +0900 Handle nested define/endef This fixes #72. commit c15a824 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Mon May 30 16:11:14 2016 +0900 Update findleaves.py and add a few testcases commit af13468 Merge: 1c3a695 f0a6fdf Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Mon May 30 16:10:34 2016 +0900 Merge pull request #73 from colincross/findleaves [C++] Add support for multiple filenames to findleaves emulation commit f0a6fdf Author: Colin Cross <ccross@android.com> Date: Fri May 27 16:58:29 2016 -0700 [C++] Add support for multiple filenames to findleaves emulation Add support for the new findleaves multiple filename searching implemented in https://android.googlesource.com/platform/build/+/9808645cd9800a7bf7afeb208f3f25c208c64c20: Add support for a new --dir= option to specify one or more directories to search, and then treat any remaining options as filenames. If no directories are specified, fall back to treating only the last option as a filename and the rest as directories. Change-Id: Ibbc81cd65bd63901ae1d0ca99ffc6255c5344d98 commit 1c3a695 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Fri May 20 16:35:35 2016 +0900 Support all kinds of command line variables This fixes #51. TODO: add tests for command line variables commit ac6f169 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Wed May 18 14:35:40 2016 +0900 Allow NULL filename for -d flag commit c58db9a Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Thu May 12 15:16:12 2016 +0900 [C++] Add -d flag to make debugging slightly easier commit 38892d8 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Mon May 9 18:51:35 2016 +0900 Normalize log for recent ninja for issue #68 commit 9f6343c Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Tue May 3 01:05:32 2016 +0900 Always sort glob results This fixes issue #69. GNU make 3 sorts both for include and $(wildcard) while GNU make 4 doesn't. commit 8082dcb Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Mon May 2 22:18:03 2016 +0900 Skip 3 tests which fail with make 4 commit 1561f68 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Mon May 2 21:40:48 2016 +0900 Skip shell_var_with_args.mk with GNU make 4 commit a1ded1c Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Mon May 2 21:21:10 2016 +0900 Use override in posix_var.mk to fix test with make 4 commit fc24bd2 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Thu Apr 28 17:32:58 2016 +0900 Stop overwriting /bin/sh by bash on travis commit 913eb74 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Thu Apr 28 17:31:24 2016 +0900 Normalize Unicode quotes for recent find commit 2d2ed95 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Thu Apr 28 16:50:46 2016 +0900 Explicitly use SHELL=/bin/bash Also use override in tests which set $(SHELL) commit d07e297 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Thu Apr 28 16:47:16 2016 +0900 [C++] Stop using an uninitialized value commit 855fea4 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Wed Apr 27 18:40:07 2016 +0900 Fix multi_implicit_output_patterns.mk for GNU make 4 This fixes issue #67 commit dc258cb Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Wed Apr 27 18:35:57 2016 +0900 Clean up normalization in runtest.rb a bit commit 3009771 Merge: 2941ea0 bfae810 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Wed Apr 27 18:34:11 2016 +0900 Merge pull request #66 from stefanb2/topic-issue-65 Fix issues 60, 63, 65 commit bfae810 Author: Stefan Becker <stefanb@gpartner-nvidia.com> Date: Wed Apr 27 11:40:09 2016 +0300 Remove test output in ckati_clean Fixes google/kati#65 Change-Id: If1efb37f5d80ffe3f0972c6aa3090c39a0d96891 commit a24a7a0 Author: Stefan Becker <stefanb@gpartner-nvidia.com> Date: Wed Apr 27 11:29:48 2016 +0300 Normalize GNU make 4.00 in runtest.rb Old GNU make: Makefile:2: *** missing rule before commands. GNU make 4.0: Makefile:2: *** missing rule before recipe. Fixes google/kati#63 Change-Id: I1774b564369e65121986618e5ef2ef05cd4da5dd commit e4e56f3 Author: Stefan Becker <stefanb@gpartner-nvidia.com> Date: Wed Apr 27 11:16:39 2016 +0300 Suppress GNU make jobserver magic in runtest.rb Fixes google/kati#60 Change-Id: I2f539f5c41f96a302a73f8cc5c44332b4f4cd7d3 commit 2941ea0 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Wed Apr 27 17:26:21 2016 +0900 [C++] Handle .POSIX at eval time .POSIX pseudo target should change the behavior of $(shell). This also implements .POSIX for ckati's non-ninja mode. commit 03fa345 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Wed Apr 27 17:08:32 2016 +0900 Add testcase/posix_var.mk For 187bf08 commit a8fafa4 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Wed Apr 27 16:57:39 2016 +0900 Remove Go related targets from test and clean Also run the test for ckati by "make test". This should mitigate issue #59. commit d8d43ea Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Wed Apr 27 16:10:47 2016 +0900 [C++] Reduce unnecessary string allocation A minor follow-up of 167e1f7 commit c6926b0 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Wed Apr 27 16:07:52 2016 +0900 Add testcase/call_with_whitespace.mk For 167e1f7 commit 5dfb361 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Wed Apr 27 16:05:48 2016 +0900 Add testcase/recursive_marker.mk For 952d445 commit 02e5ee3 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Wed Apr 27 15:49:13 2016 +0900 [C++] Remove unnecessary #include Was added in 29b9b74 commit 6823600 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Wed Apr 27 15:47:57 2016 +0900 Add a test case to override_override.mk This is a testcase for 29b9b74 commit 4e60e5f Merge: becba50 952d445 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Wed Apr 27 15:44:51 2016 +0900 Merge pull request #58 from stefanb2/topic-issue-57 Fix issues: 48, 49, 50, 53, 54, 57 commit 952d445 Author: Stefan Becker <stefanb@gpartner-nvidia.com> Date: Wed Apr 13 13:55:34 2016 +0300 [C++] Ignore recursive marker in recipes Test case: $ cat Makefile.recursive .PHONY: default default: +echo DONE $ ckati --warn --gen_all_targets --regen --ninja -f Makefile.recursive Makefile.recursive was modified, regenerating... $ fgrep DONE build.ninja command = /bin/sh -c "+echo DONE" $ ninja [1/1] build default FAILED: default /bin/sh -c "+echo DONE" /bin/sh: + : invalid option Usage: /bin/sh [GNU long option] [option] ... ... Fixes google/kati#57 Change-Id: Ic40d71ff2b168158661eb2eac638adaeadaec1fe commit 786881c Author: Stefan Becker <stefanb@gpartner-nvidia.com> Date: Fri Apr 8 15:45:16 2016 +0300 [C++] Replace erroneous return in EvalInclude() We need to continue the loop, not abort the function, otherwise kati will ignore include files that should not be ignored. Test case: $ cat Makefile.minus-include-main .PHONY: default default: -include Makefile.minus-include-? $ cat Makefile.minus-include-a $(info include a...) $ cat Makefile.minus-include-b $(info include b...) $ ckati --warn --gen_all_targets --regen --ninja -f Makefile.minus-include-main include b... include a... $ ckati --warn --gen_all_targets --regen --ninja -f Makefile.minus-include-main --ignore_optional_include=Makefile.minus-include-a arguments changed, regenerating... include b... $ ckati --warn --gen_all_targets --regen --ninja -f Makefile.minus-include-main --ignore_optional_include=Makefile.minus-include-b arguments changed, regenerating... Fixes google/kati#54 Change-Id: I139392510b02d48c224edf4a8e6e186d52f26699 commit d4f2871 Author: Stefan Becker <stefanb@gpartner-nvidia.com> Date: Thu Apr 7 13:29:36 2016 +0300 [C++] Store SHELL value in command result $(shell ...) command lines are executed using $(SHELL). We need to use the same shell during regeneration check instead of hard-coding /bin/sh or otherwise the results might be different when $(SHELL) is redefined in the makefile. Fixes google/kati#53 Change-Id: I1f9809106f29f7e806324a82e2323a2f8df64b63 commit 29b9b74 Author: Stefan Becker <stefanb@gpartner-nvidia.com> Date: Thu Apr 7 13:29:23 2016 +0300 [C++] Honor "override" when setting global variable Regression when compared to GNU make behaviour. Test case: $ cat Makefile.override-failure $(info VAR: '$(VAR)') override VAR := test $(info VAR: '$(VAR)') override VAR := test-new $(info VAR: '$(VAR)') VAR := test-should-not-work $(info VAR: '$(VAR)') $ make -f Makefile.override-failure VAR: '' VAR: 'test' VAR: 'test-new' VAR: 'test-new' make: *** No targets. Stop. $ ckati -c --warn -f Makefile.override-failure VAR: '' VAR: 'test' VAR: 'test' VAR: 'test' *** No targets. Fixes google/kati#50 Change-Id: I9c4185c30cfcf5602da7e0ac98b7e9c420788005 commit 167e1f7 Author: Stefan Becker <stefanb@gpartner-nvidia.com> Date: Thu Apr 7 13:29:03 2016 +0300 [C++] Ignore white space around $(call) function name Regression when compared to GNU make behaviour. Test case: $ cat Makefile.call-func-name func = $(info called with '$(1)') test = $(call $(1),$(1)) $(call test,func) $(call test, func) $(call test,func ) $(call test, func ) $ make -f Makefile.call-func-name called with 'func' called with ' func' called with 'func ' called with ' func ' make: *** No targets. Stop. $ ckati -c --warn -f Makefile.call-func-name called with 'func' Makefile.call-func-name:5: *warning*: undefined user function: func Makefile.call-func-name:6: *warning*: undefined user function: func Makefile.call-func-name:5: *warning*: undefined user function: func *** No targets. Fixes google/kati#49 Change-Id: I3d982cd8d6d9777034df64540c32846300cb72f2 commit 187bf08 Author: Stefan Becker <stefanb@gpartner-nvidia.com> Date: Thu Apr 7 13:28:42 2016 +0300 [C++] Add support for .POSIX: Add a global flag that is set to "true" when .POSIX: is encountered. The flag will switch the bash flags from "-c" to "-ec", i.e. enable correct error handling of shell command lines. Fixes google/kati#48 Change-Id: Ieea386742b05b52d209b74e640e14212f0e2da88 commit cd060c5 Author: Stefan Becker <stefanb@gpartner-nvidia.com> Date: Thu Apr 7 13:28:16 2016 +0300 add Stefan to CONTRIBUTORS Change-Id: I4ee4ce5d72e855306546deee2b4e9c3c25694585 commit becba50 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Tue Apr 12 15:21:08 2016 +0900 [C++] Strip a trailing \r commit 706c27f Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Mon Apr 11 18:35:06 2016 +0900 Handle EINTR on read It seems read(2) for files may be interrupted on Mac when ckati is running under a debugger. commit 84ddbd2 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Sat Apr 9 13:35:27 2016 +0900 [C++] Use USE_GOMA variable to see goma will be used commit 89f6a2b Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Sat Apr 9 12:32:23 2016 +0900 [C++] Error for missing endef A fix for google/kati#55 commit 083fd26 Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Sat Apr 9 12:28:34 2016 +0900 [C++] Error for missing endif A fix for google/kati#55 commit a5b193c Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Fri Mar 25 14:57:50 2016 +0900 Remove out/pkg when go source code is updated commit d74c7bb Author: Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Date: Fri Mar 25 04:07:19 2016 +0900 Remove bashism from Makefile for go version Change-Id: I98395238f2a1ed19aa03f3518c9c0cbb7ea4e023 Revert "Don't ignore all date/echo commands" This reverts commit 40e5a3d. Change-Id: Ie50ead523c209522ea416f755d2b82cfad2ea4f9 Signed-off-by: Caio Oliveira <caiooliveirafarias0@gmail.com>
zchee
pushed a commit
to zchee/kati
that referenced
this issue
Nov 29, 2016
We need to continue the loop, not abort the function, otherwise kati will ignore include files that should not be ignored. Test case: $ cat Makefile.minus-include-main .PHONY: default default: -include Makefile.minus-include-? $ cat Makefile.minus-include-a $(info include a...) $ cat Makefile.minus-include-b $(info include b...) $ ckati --warn --gen_all_targets --regen --ninja -f Makefile.minus-include-main include b... include a... $ ckati --warn --gen_all_targets --regen --ninja -f Makefile.minus-include-main --ignore_optional_include=Makefile.minus-include-a arguments changed, regenerating... include b... $ ckati --warn --gen_all_targets --regen --ninja -f Makefile.minus-include-main --ignore_optional_include=Makefile.minus-include-b arguments changed, regenerating... Fixes google#54 Change-Id: I139392510b02d48c224edf4a8e6e186d52f26699
zchee
pushed a commit
to zchee/kati
that referenced
this issue
Nov 29, 2016
We need to continue the loop, not abort the function, otherwise kati will ignore include files that should not be ignored. Test case: $ cat Makefile.minus-include-main .PHONY: default default: -include Makefile.minus-include-? $ cat Makefile.minus-include-a $(info include a...) $ cat Makefile.minus-include-b $(info include b...) $ ckati --warn --gen_all_targets --regen --ninja -f Makefile.minus-include-main include b... include a... $ ckati --warn --gen_all_targets --regen --ninja -f Makefile.minus-include-main --ignore_optional_include=Makefile.minus-include-a arguments changed, regenerating... include b... $ ckati --warn --gen_all_targets --regen --ninja -f Makefile.minus-include-main --ignore_optional_include=Makefile.minus-include-b arguments changed, regenerating... Fixes google#54 Change-Id: I139392510b02d48c224edf4a8e6e186d52f26699
zchee
pushed a commit
to zchee/kati
that referenced
this issue
Nov 29, 2016
We need to continue the loop, not abort the function, otherwise kati will ignore include files that should not be ignored. Test case: $ cat Makefile.minus-include-main .PHONY: default default: -include Makefile.minus-include-? $ cat Makefile.minus-include-a $(info include a...) $ cat Makefile.minus-include-b $(info include b...) $ ckati --warn --gen_all_targets --regen --ninja -f Makefile.minus-include-main include b... include a... $ ckati --warn --gen_all_targets --regen --ninja -f Makefile.minus-include-main --ignore_optional_include=Makefile.minus-include-a arguments changed, regenerating... include b... $ ckati --warn --gen_all_targets --regen --ninja -f Makefile.minus-include-main --ignore_optional_include=Makefile.minus-include-b arguments changed, regenerating... Fixes google#54 Change-Id: I139392510b02d48c224edf4a8e6e186d52f26699
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Test case:
This is caused by an erroneous
returnstatement in eval.cc:EvalInclude().The text was updated successfully, but these errors were encountered: