From f00e35ecae062be5bfa4fc9dc8cf4ed3b503bed1 Mon Sep 17 00:00:00 2001
From: Sasha Smundak <asmundak@google.com>
Date: Thu, 26 Aug 2021 09:42:55 -0700
Subject: [PATCH] If filter/filter_out pattern is a list, remove empty elements
 from it.

Also, fix __mk2regex bug: the returned pattern should end with $.
Bug: 193540681
Test: internal
Change-Id: Ia56856826c6b05ccf857ae5ab7a70609bf4f1e1d

Change-Id: Ie2a9bf62ee48824ce7cd5fe9e9ec2f55311473e3
---
 core/product_config.rbc | 2 +-
 tests/run.rbc           | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/product_config.rbc b/core/product_config.rbc
index ef0d0c9f7e..8fbcfa5782 100644
--- a/core/product_config.rbc
+++ b/core/product_config.rbc
@@ -439,7 +439,7 @@ def __mk2regex(words):
     """Returns regular expression equivalent to Make pattern."""
 
     # TODO(asmundak): this will mishandle '\%'
-    return "^(" + "|".join([w.replace("%", ".*", 1) for w in words]) + ")"
+    return "^(" + "|".join([w.replace("%", ".*", 1) for w in words if w]) + ")$"
 
 def _regex_match(regex, w):
     return rblf_regex(regex, w)
diff --git a/tests/run.rbc b/tests/run.rbc
index 4d7166a29a..2c15b8105c 100644
--- a/tests/run.rbc
+++ b/tests/run.rbc
@@ -47,6 +47,9 @@ assert_eq(["%/foo"], rblf.mkpatsubst("%", "\\%/%", ["foo"]))
 assert_eq(["foo/%"], rblf.mkpatsubst("%", "%/%", ["foo"]))
 assert_eq(["from/a:to/a", "from/b:to/b"], rblf.product_copy_files_by_pattern("from/%", "to/%", "a b"))
 
+assert_eq([], rblf.filter(["a", "", "b"], "f"))
+assert_eq(["", "b"], rblf.filter_out(["a", "" ], ["a", "", "b"] ))
+
 globals, config = rblf.product_configuration("test/device", init)
 assert_eq(
     {