diff options
| author | 2022-04-08 18:09:22 -0700 | |
|---|---|---|
| committer | 2022-04-12 15:25:14 -0700 | |
| commit | 1c08360ca8c270b7a16091243623399b50f29b51 (patch) | |
| tree | 9366f00cb7f59604bda4f68cdd1b71f7c76d2f1f /tests/single_value_inheritance | |
| parent | ea935b5ad9f19e5c44663feed3a620ea8c54c467 (diff) | |
Evaluate intermediate products properly
When an intermediate product is evaluated, it needs to
act as if it's the only product being evaulated. However,
currently, if it inherited a makefile that was also being
inherited by the overall top level product via a different
path, it would not get the values from that makefile.
Copy the configs dictionary before evaluating each product
that needs artifact path requirements, and create seperate
postfix orders for all of them that don't contain any products
that they don't inherit from.
Bug: 221312707
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I235ad78d587a2e315ba446b5e126d8f6d0fbbea7
Diffstat (limited to 'tests/single_value_inheritance')
| -rw-r--r-- | tests/single_value_inheritance/test.rbc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/single_value_inheritance/test.rbc b/tests/single_value_inheritance/test.rbc index dcde7e0db7..e4f44f4ae8 100644 --- a/tests/single_value_inheritance/test.rbc +++ b/tests/single_value_inheritance/test.rbc @@ -22,7 +22,7 @@ def assert_eq(expected, actual): fail("Expected '%s', got '%s'" % (expected, actual)) def test(): - (globals, config, globals_base) = rblf.product_configuration("test/device", init, input_variables_init) - assert_eq("tablet", config["PRODUCT_CHARACTERISTICS"]) - assert_eq("vendor/myvendor/certs/devkeys/devkey", config["PRODUCT_DEFAULT_DEV_CERTIFICATE"]) - assert_eq(["foo", "bar"], config["PRODUCT_PACKAGES"]) + (globals, globals_base) = rblf.product_configuration("test/device", init, input_variables_init) + assert_eq("tablet", globals["PRODUCTS.test/device.mk.PRODUCT_CHARACTERISTICS"]) + assert_eq("vendor/myvendor/certs/devkeys/devkey", globals["PRODUCTS.test/device.mk.PRODUCT_DEFAULT_DEV_CERTIFICATE"]) + assert_eq(["foo", "bar"], globals["PRODUCTS.test/device.mk.PRODUCT_PACKAGES"]) |