diff --git a/prebuilts/api/26.0/26.0.ignore.cil b/prebuilts/api/26.0/26.0.ignore.cil index 3228a98985becbc3ae318bf2c421b012916234c9..e713bc1ca4c59a333bb5082bf49fe086afccfb14 100644 --- a/prebuilts/api/26.0/26.0.ignore.cil +++ b/prebuilts/api/26.0/26.0.ignore.cil @@ -14,5 +14,6 @@ mediaprovider_tmpfs netd_stable_secret_prop sysfs_fs_ext4_features + system_net_netd_hwservice timezone_service tombstoned_java_trace_socket)) diff --git a/tests/treble_sepolicy_tests.py b/tests/treble_sepolicy_tests.py index 770ff97d695fb0f2fb1a9cf9fbd44b1a3b7057cf..b358a14e12cb96a9c2bd19659ddf98b5212393db 100644 --- a/tests/treble_sepolicy_tests.py +++ b/tests/treble_sepolicy_tests.py @@ -92,7 +92,7 @@ def GetCoreDomains(): global alldomains global coredomains for d in alldomains: - # TestCoredomainViolators will verify if coredomain was incorrectly + # TestCoredomainViolations will verify if coredomain was incorrectly # applied. if "coredomain" in alldomains[d].attributes: alldomains[d].coredomain = True @@ -205,7 +205,7 @@ class MultipleOption(Option): else: Option.take_action(self, action, dest, opt, value, values, parser) -Tests = ["CoredomainViolators"] +Tests = ["CoredomainViolations"] if __name__ == '__main__': usage = "treble_sepolicy_tests.py -f nonplat_file_contexts -f " @@ -215,7 +215,7 @@ if __name__ == '__main__': metavar="FILE", action="extend", type="string") parser.add_option("-p", "--policy", dest="policy", metavar="FILE") parser.add_option("-l", "--library-path", dest="libpath", metavar="FILE") - parser.add_option("-t", "--test", dest="test", action="extend", + parser.add_option("-t", "--test", dest="tests", action="extend", help="Test options include "+str(Tests)) (options, args) = parser.parse_args() @@ -247,8 +247,11 @@ if __name__ == '__main__': results = "" # If an individual test is not specified, run all tests. - if options.test is None or "CoredomainViolations" in options.tests: + if ( options.tests is None + or ("CoredomainViolations" in options.tests and len(options.tests) == 1)): results += TestCoredomainViolations() + else: + sys.exit("Error: unknown test(s): " + str(options.tests)) if len(results) > 0: sys.exit(results)