sanitycheck: inclusive language
change whitelist -> allow.
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
diff --git a/scripts/sanity_chk/sanitylib.py b/scripts/sanity_chk/sanitylib.py
index b767af9..633b202 100644
--- a/scripts/sanity_chk/sanitylib.py
+++ b/scripts/sanity_chk/sanitylib.py
@@ -1437,13 +1437,13 @@
self.tags = set()
self.extra_args = None
self.extra_configs = None
- self.arch_whitelist = None
+ self.arch_allow = None
self.arch_exclude = None
self.skip = False
self.platform_exclude = None
- self.platform_whitelist = None
+ self.platform_allow = None
self.toolchain_exclude = None
- self.toolchain_whitelist = None
+ self.toolchain_allow = None
self.tc_filter = None
self.timeout = 60
self.harness = ""
@@ -2134,19 +2134,19 @@
def cleanup_artifacts(self):
logger.debug("Cleaning up {}".format(self.instance.build_dir))
- whitelist = [
+ allow = [
'zephyr/.config',
'handler.log',
'build.log',
'device.log',
'recording.csv',
]
- whitelist = [os.path.join(self.instance.build_dir, file) for file in whitelist]
+ allow = [os.path.join(self.instance.build_dir, file) for file in allow]
for dirpath, dirnames, filenames in os.walk(self.instance.build_dir, topdown=False):
for name in filenames:
path = os.path.join(dirpath, name)
- if path not in whitelist:
+ if path not in allow:
os.remove(path)
# Remove empty directories and symbolic links to directories
for dir in dirnames:
@@ -2321,14 +2321,14 @@
"min_ram": {"type": "int", "default": 8},
"depends_on": {"type": "set"},
"min_flash": {"type": "int", "default": 32},
- "arch_whitelist": {"type": "set"},
+ "arch_allow": {"type": "set"},
"arch_exclude": {"type": "set"},
"extra_sections": {"type": "list", "default": []},
"integration_platforms": {"type": "list", "default": []},
"platform_exclude": {"type": "set"},
- "platform_whitelist": {"type": "set"},
+ "platform_allow": {"type": "set"},
"toolchain_exclude": {"type": "set"},
- "toolchain_whitelist": {"type": "set"},
+ "toolchain_allow": {"type": "set"},
"filter": {"type": "str"},
"harness": {"type": "str"},
"harness_config": {"type": "map", "default": {}}
@@ -2668,13 +2668,13 @@
tc.tags = tc_dict["tags"]
tc.extra_args = tc_dict["extra_args"]
tc.extra_configs = tc_dict["extra_configs"]
- tc.arch_whitelist = tc_dict["arch_whitelist"]
+ tc.arch_allow = tc_dict["arch_allow"]
tc.arch_exclude = tc_dict["arch_exclude"]
tc.skip = tc_dict["skip"]
tc.platform_exclude = tc_dict["platform_exclude"]
- tc.platform_whitelist = tc_dict["platform_whitelist"]
+ tc.platform_allow = tc_dict["platform_allow"]
tc.toolchain_exclude = tc_dict["toolchain_exclude"]
- tc.toolchain_whitelist = tc_dict["toolchain_whitelist"]
+ tc.toolchain_allow = tc_dict["toolchain_allow"]
tc.tc_filter = tc_dict["filter"]
tc.timeout = tc_dict["timeout"]
tc.harness = tc_dict["harness"]
@@ -2833,8 +2833,8 @@
if not force_platform:
- if tc.arch_whitelist and plat.arch not in tc.arch_whitelist:
- discards[instance] = discards.get(instance, "Not in test case arch whitelist")
+ if tc.arch_allow and plat.arch not in tc.arch_allow:
+ discards[instance] = discards.get(instance, "Not in test case arch allow list")
if tc.arch_exclude and plat.arch in tc.arch_exclude:
discards[instance] = discards.get(instance, "In test case arch exclude")
@@ -2848,11 +2848,11 @@
if platform_filter and plat.name not in platform_filter:
discards[instance] = discards.get(instance, "Command line platform filter")
- if tc.platform_whitelist and plat.name not in tc.platform_whitelist:
- discards[instance] = discards.get(instance, "Not in testcase platform whitelist")
+ if tc.platform_allow and plat.name not in tc.platform_allow:
+ discards[instance] = discards.get(instance, "Not in testcase platform allow list")
- if tc.toolchain_whitelist and toolchain not in tc.toolchain_whitelist:
- discards[instance] = discards.get(instance, "Not in testcase toolchain whitelist")
+ if tc.toolchain_allow and toolchain not in tc.toolchain_allow:
+ discards[instance] = discards.get(instance, "Not in testcase toolchain allow list")
if not plat.env_satisfied:
discards[instance] = discards.get(instance, "Environment ({}) not satisfied".format(", ".join(plat.env)))
@@ -2890,9 +2890,9 @@
# if sanitycheck was launched with no platform options at all, we
# take all default platforms
if default_platforms and not tc.build_on_all:
- if tc.platform_whitelist:
+ if tc.platform_allow:
a = set(self.default_platforms)
- b = set(tc.platform_whitelist)
+ b = set(tc.platform_allow)
c = a.intersection(b)
if c:
aa = list(filter(lambda tc: tc.platform.name in c, instance_list))
diff --git a/scripts/sanity_chk/testcase-schema.yaml b/scripts/sanity_chk/testcase-schema.yaml
index b62e5dc..763183c 100644
--- a/scripts/sanity_chk/testcase-schema.yaml
+++ b/scripts/sanity_chk/testcase-schema.yaml
@@ -17,7 +17,7 @@
"arch_exclude":
type: str
required: no
- "arch_whitelist":
+ "arch_allow":
type: str
required: no
"build_only":
@@ -83,7 +83,7 @@
"platform_exclude":
type: str
required: no
- "platform_whitelist":
+ "platform_allow":
type: str
required: no
"tags":
@@ -95,7 +95,7 @@
"toolchain_exclude":
type: str
required: no
- "toolchain_whitelist":
+ "toolchain_allow":
type: str
required: no
"type":
@@ -137,7 +137,7 @@
"arch_exclude":
type: str
required: no
- "arch_whitelist":
+ "arch_allow":
type: str
required: no
"build_only":
@@ -208,7 +208,7 @@
"platform_exclude":
type: str
required: no
- "platform_whitelist":
+ "platform_allow":
type: str
required: no
"tags":
@@ -220,7 +220,7 @@
"toolchain_exclude":
type: str
required: no
- "toolchain_whitelist":
+ "toolchain_allow":
type: str
required: no
"type":
diff --git a/scripts/sanitycheck b/scripts/sanitycheck
index 2db6ec1..3b8bb15 100755
--- a/scripts/sanitycheck
+++ b/scripts/sanitycheck
@@ -67,13 +67,13 @@
Length of time to run test in emulator before automatically killing it.
Default to 60 seconds.
- arch_whitelist: <list of arches, such as x86, arm, arc>
+ arch_allow: <list of arches, such as x86, arm, arc>
Set of architectures that this test case should only be run for.
arch_exclude: <list of arches, such as x86, arm, arc>
Set of architectures that this test case should not run on.
- platform_whitelist: <list of platforms>
+ platform_allow: <list of platforms>
Set of platforms that this test case should only be run for.
platform_exclude: <list of platforms>
@@ -131,7 +131,7 @@
not (right associative)
all comparison operators (non-associative)
- arch_whitelist, arch_exclude, platform_whitelist, platform_exclude
+ arch_allow, arch_exclude, platform_allow, platform_exclude
are all syntactic sugar for these expressions. For instance
arch_exclude = x86 arc
diff --git a/scripts/tests/sanitycheck/test_testsuite_class.py b/scripts/tests/sanitycheck/test_testsuite_class.py
index cef96d2..0598033 100755
--- a/scripts/tests/sanitycheck/test_testsuite_class.py
+++ b/scripts/tests/sanitycheck/test_testsuite_class.py
@@ -140,12 +140,12 @@
assert "Key error while parsing tests file.('status')" in caplog.text
TESTDATA_PART1 = [
- ("toolchain_whitelist", ['gcc'], None, None, "Not in testcase toolchain whitelist"),
- ("platform_whitelist", ['demo_board_1'], None, None, "Not in testcase platform whitelist"),
+ ("toolchain_allow", ['gcc'], None, None, "Not in testcase toolchain allow list"),
+ ("platform_allow", ['demo_board_1'], None, None, "Not in testcase platform allow list"),
("toolchain_exclude", ['zephyr'], None, None, "In test case toolchain exclude"),
("platform_exclude", ['demo_board_2'], None, None, "In test case platform exclude"),
("arch_exclude", ['x86_demo'], None, None, "In test case arch exclude"),
- ("arch_whitelist", ['arm'], None, None, "Not in test case arch whitelist"),
+ ("arch_allow", ['arm'], None, None, "Not in test case arch allow list"),
("skip", True, None, None, "Skip filter"),
("tags", set(['sensor', 'bluetooth']), "ignore_tags", ['bluetooth'], "Excluded tags per platform (exclude_tags)"),
("min_flash", "2024", "flash", "1024", "Not enough FLASH"),
@@ -184,18 +184,18 @@
if plat_attribute == "supported_toolchains":
plat.supported_toolchains = plat_value
for _, testcase in class_testsuite.testcases.items():
- if tc_attribute == "toolchain_whitelist":
- testcase.toolchain_whitelist = tc_value
- if tc_attribute == "platform_whitelist":
- testcase.platform_whitelist = tc_value
+ if tc_attribute == "toolchain_allow":
+ testcase.toolchain_allow = tc_value
+ if tc_attribute == "platform_allow":
+ testcase.platform_allow = tc_value
if tc_attribute == "toolchain_exclude":
testcase.toolchain_exclude = tc_value
if tc_attribute == "platform_exclude":
testcase.platform_exclude = tc_value
if tc_attribute == "arch_exclude":
testcase.arch_exclude = tc_value
- if tc_attribute == "arch_whitelist":
- testcase.arch_whitelist = tc_value
+ if tc_attribute == "arch_allow":
+ testcase.arch_allow = tc_value
if tc_attribute == "skip":
testcase.skip = tc_value
if tc_attribute == "tags":
