diff options
| author | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2016-05-02 22:18:03 +0900 |
|---|---|---|
| committer | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2016-05-02 22:18:03 +0900 |
| commit | 8082dcbc7822870a6bf5363b26aca96df0da5847 (patch) | |
| tree | 77c509f68821bf8648037bcdad0f83093873c990 | |
| parent | 1561f684d13a41cac8c4c0cad402b38f89be720e (diff) | |
| download | android_build_kati-8082dcbc7822870a6bf5363b26aca96df0da5847.tar.gz android_build_kati-8082dcbc7822870a6bf5363b26aca96df0da5847.tar.bz2 android_build_kati-8082dcbc7822870a6bf5363b26aca96df0da5847.zip | |
Skip 3 tests which fail with make 4
| -rw-r--r-- | testcase/err_export_override.mk | 7 | ||||
| -rw-r--r-- | testcase/err_override_export.mk | 7 | ||||
| -rw-r--r-- | testcase/wildcard_cache.mk | 7 |
3 files changed, 21 insertions, 0 deletions
diff --git a/testcase/err_export_override.mk b/testcase/err_export_override.mk index 54de5b9..6bb9f75 100644 --- a/testcase/err_export_override.mk +++ b/testcase/err_export_override.mk @@ -1,5 +1,12 @@ # TODO(c): Fix - "override export define A" is invalid "override" directive. +# GNU make 4 accepts this syntax. Note kati doesn't agree with make 4 +# either. +MAKEVER:=$(shell make --version | ruby -n0e 'puts $$_[/Make (\d)/,1]') +ifeq ($(MAKE)$(MAKEVER),make4) +$(error test skipped) +endif + export override define A PASS_A endef diff --git a/testcase/err_override_export.mk b/testcase/err_override_export.mk index d34a06f..2d72aab 100644 --- a/testcase/err_override_export.mk +++ b/testcase/err_override_export.mk @@ -1,5 +1,12 @@ # TODO(c): Fix - "override export define A" is invalid "override" directive. +# GNU make 4 accepts this syntax. Note kati doesn't agree with make 4 +# either. +MAKEVER:=$(shell make --version | ruby -n0e 'puts $$_[/Make (\d)/,1]') +ifeq ($(MAKE)$(MAKEVER),make4) +$(error test skipped) +endif + override export define A PASS_A endef diff --git a/testcase/wildcard_cache.mk b/testcase/wildcard_cache.mk index 1c9174a..83ba3db 100644 --- a/testcase/wildcard_cache.mk +++ b/testcase/wildcard_cache.mk @@ -1,4 +1,11 @@ # TODO(c): Fix this. Maybe $(wildcard) always runs at eval-phase. + +# GNU make 4 agrees with ckati. +MAKEVER:=$(shell make --version | ruby -n0e 'puts $$_[/Make (\d)/,1]') +ifeq ($(MAKE)$(MAKEVER),make4) +$(error test skipped) +endif + files = $(wildcard *,*) # if make starts without foo,bar, it will be empty, although expect foo,bar. |