From a99afdfc221b1b7b8295d2aaccd9c68f701e1fd8 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 26 Apr 2022 12:06:49 -0700 Subject: Allow comparing $(wildcard) results to non-empty values Also remove the file existence functions because they can just be wildcards instead. Bug: 226974242 Test: go test Change-Id: Icbf65c47af97a710580864e8b76e2697aba96dd8 --- mk2rbc/mk2rbc_test.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'mk2rbc/mk2rbc_test.go') diff --git a/mk2rbc/mk2rbc_test.go b/mk2rbc/mk2rbc_test.go index de7512927..193e6357c 100644 --- a/mk2rbc/mk2rbc_test.go +++ b/mk2rbc/mk2rbc_test.go @@ -568,14 +568,18 @@ ifeq (,$(wildcard foo.mk)) endif ifneq (,$(wildcard foo*.mk)) endif +ifeq (foo1.mk foo2.mk barxyz.mk,$(wildcard foo*.mk bar*.mk)) +endif `, expected: `load("//build/make/core:product_config.rbc", "rblf") def init(g, handle): cfg = rblf.cfg(handle) - if not rblf.file_exists("foo.mk"): + if not rblf.expand_wildcard("foo.mk"): + pass + if rblf.expand_wildcard("foo*.mk"): pass - if rblf.file_wildcard_exists("foo*.mk"): + if rblf.expand_wildcard("foo*.mk bar*.mk") == ["foo1.mk", "foo2.mk", "barxyz.mk"]:␤ pass `, }, -- cgit v1.2.3-59-g8ed1b