diff options
| author | Raphael Herouart <rherouart@google.com> | 2024-02-21 15:31:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-21 15:31:28 +0000 |
| commit | 54a3583b77425a78b799813199af0a2d34b15b9c (patch) | |
| tree | 75068c380f46a9c4684df3d642e4a1a3ecbd363d | |
| parent | 025afc6daffaa67b6d9a8bff2b160b004fcf96a0 (diff) | |
| parent | 9f0d22ed9feec89bb25467deb04f00a734088154 (diff) | |
| download | aosp-54a3583b77425a78b799813199af0a2d34b15b9c.tar.gz | |
scripts: Flags Should not apply to all commands am: 9f0d22ed9f
Original change: https://android-review.googlesource.com/c/trusty/vendor/google/aosp/+/2969576
Change-Id: I6d64b56652b9db05d5c36eff959641063a3f7570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | scripts/trusty_build_config.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/trusty_build_config.py b/scripts/trusty_build_config.py index 142bea8..ca8b591 100755 --- a/scripts/trusty_build_config.py +++ b/scripts/trusty_build_config.py @@ -114,7 +114,7 @@ class TrustyHostTest(TrustyTest): class TrustyAndroidTest(TrustyTest): """Stores a test name and command to run inside Android""" - def __init__(self, name, command, need=TrustyPortTestFlags(), + def __init__(self, name, command, need=None, port_type=PortType.TEST, enabled=True, nameprefix="", runargs=(), timeout=None): nameprefix = nameprefix + "android-test:" @@ -125,7 +125,10 @@ class TrustyAndroidTest(TrustyTest): cmd += list(runargs) super().__init__(nameprefix + name, cmd, enabled, port_type) self.shell_command = command - self.need = need + if need: + self.need = need + else: + self.need = TrustyPortTestFlags() def needs(self, **need): self.need.set(**need) |