Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3b087d7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "If filter/filter_out pattern is a list, remove empty elements from it." am: fe93495f 

Original change: https://android-review.googlesource.com/c/platform/build/+/1810525

Change-Id: Ic2dc2ced2c48fa763eb8948de80c0569e609e3c5
parents 0f50d879 fe93495f

core/product_config.rbc

+1 −1
Original line number Diff line number Diff line
@@ -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)

tests/run.rbc

+3 −0
Original line number Diff line number Diff line
@@ -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(

    {