summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-07-31 20:36:07 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-07-31 20:36:07 +0000
commitabe5e13b9fc4eb9dbffd72ad4ae57d82183c04b7 (patch)
tree6b944dd2f4e56b71d4d9e55d45bdc677b0fc424a
parent7b4449ae94b936053dd322b0936382244fde2021 (diff)
parent419f9a38029954503760297e9a548f949fffd069 (diff)
Merge "add override_apex to version_variant test" into main
-rw-r--r--apex/apex_test.go10
1 files changed, 10 insertions, 0 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go
index ed780338a..9dba08e46 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -6794,6 +6794,10 @@ func TestApexAvailable_ApexAvailableNameWithVersionCode(t *testing.T) {
public_key: "testkey.avbpubkey",
private_key: "testkey.pem",
}
+ override_apex {
+ name: "myoverrideapex",
+ base: "bar",
+ }
`)
fooManifestRule := result.ModuleForTests("foo", "android_common_foo_image").Rule("apexManifestRule")
@@ -6810,6 +6814,12 @@ func TestApexAvailable_ApexAvailableNameWithVersionCode(t *testing.T) {
if barActualDefaultVersion != barExpectedDefaultVersion {
t.Errorf("expected to find defaultVersion %q; got %q", barExpectedDefaultVersion, barActualDefaultVersion)
}
+
+ overrideBarManifestRule := result.ModuleForTests("bar", "android_common_myoverrideapex_bar_image").Rule("apexManifestRule")
+ overrideBarActualDefaultVersion := overrideBarManifestRule.Args["default_version"]
+ if overrideBarActualDefaultVersion != barExpectedDefaultVersion {
+ t.Errorf("expected to find defaultVersion %q; got %q", barExpectedDefaultVersion, barActualDefaultVersion)
+ }
}
func TestApexAvailable_ApexAvailableName(t *testing.T) {