From 693de729d0a230b14583980225c9cba0ba51a1ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20M=C3=BCller?= Date: Tue, 9 Aug 2022 10:23:11 -0700 Subject: [PATCH] Rename blacklists and whitelists MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream uses denylist and allowlist terminology instead of blacklist and whitelist. It also has established a less deeply nested directory structure. This change renames the blacklist & whitelist files accordingly and moves them one level up out of their containing directory to mirror the layout we have upstream as well as in kernel-patches/vmtest. Signed-off-by: Daniel Müller --- .../{whitelist/WHITELIST-4.9.0 => ALLOWLIST-4.9.0} | 0 .../{whitelist/WHITELIST-5.5.0 => ALLOWLIST-5.5.0} | 0 .../configs/{blacklist/BLACKLIST-5.5.0 => DENYLIST-5.5.0} | 0 .../{blacklist/BLACKLIST-latest => DENYLIST-latest} | 0 .../BLACKLIST-latest.s390x => DENYLIST-latest.s390x} | 0 travis-ci/vmtest/run_selftests.sh | 8 ++++---- 6 files changed, 4 insertions(+), 4 deletions(-) rename travis-ci/vmtest/configs/{whitelist/WHITELIST-4.9.0 => ALLOWLIST-4.9.0} (100%) rename travis-ci/vmtest/configs/{whitelist/WHITELIST-5.5.0 => ALLOWLIST-5.5.0} (100%) rename travis-ci/vmtest/configs/{blacklist/BLACKLIST-5.5.0 => DENYLIST-5.5.0} (100%) rename travis-ci/vmtest/configs/{blacklist/BLACKLIST-latest => DENYLIST-latest} (100%) rename travis-ci/vmtest/configs/{blacklist/BLACKLIST-latest.s390x => DENYLIST-latest.s390x} (100%) diff --git a/travis-ci/vmtest/configs/whitelist/WHITELIST-4.9.0 b/travis-ci/vmtest/configs/ALLOWLIST-4.9.0 similarity index 100% rename from travis-ci/vmtest/configs/whitelist/WHITELIST-4.9.0 rename to travis-ci/vmtest/configs/ALLOWLIST-4.9.0 diff --git a/travis-ci/vmtest/configs/whitelist/WHITELIST-5.5.0 b/travis-ci/vmtest/configs/ALLOWLIST-5.5.0 similarity index 100% rename from travis-ci/vmtest/configs/whitelist/WHITELIST-5.5.0 rename to travis-ci/vmtest/configs/ALLOWLIST-5.5.0 diff --git a/travis-ci/vmtest/configs/blacklist/BLACKLIST-5.5.0 b/travis-ci/vmtest/configs/DENYLIST-5.5.0 similarity index 100% rename from travis-ci/vmtest/configs/blacklist/BLACKLIST-5.5.0 rename to travis-ci/vmtest/configs/DENYLIST-5.5.0 diff --git a/travis-ci/vmtest/configs/blacklist/BLACKLIST-latest b/travis-ci/vmtest/configs/DENYLIST-latest similarity index 100% rename from travis-ci/vmtest/configs/blacklist/BLACKLIST-latest rename to travis-ci/vmtest/configs/DENYLIST-latest diff --git a/travis-ci/vmtest/configs/blacklist/BLACKLIST-latest.s390x b/travis-ci/vmtest/configs/DENYLIST-latest.s390x similarity index 100% rename from travis-ci/vmtest/configs/blacklist/BLACKLIST-latest.s390x rename to travis-ci/vmtest/configs/DENYLIST-latest.s390x diff --git a/travis-ci/vmtest/run_selftests.sh b/travis-ci/vmtest/run_selftests.sh index d5d44d1..b2cee55 100755 --- a/travis-ci/vmtest/run_selftests.sh +++ b/travis-ci/vmtest/run_selftests.sh @@ -22,13 +22,13 @@ test_progs() { # "&& true" does not change the return code (it is not executed # if the Python script fails), but it prevents exiting on a # failure due to the "set -e". - ./test_progs ${BLACKLIST:+-d$BLACKLIST} ${WHITELIST:+-a$WHITELIST} && true + ./test_progs ${DENYLIST:+-d$DENYLIST} ${ALLOWLIST:+-a$ALLOWLIST} && true echo "test_progs:$?" >> "${STATUS_FILE}" foldable end test_progs fi foldable start test_progs-no_alu32 "Testing test_progs-no_alu32" - ./test_progs-no_alu32 ${BLACKLIST:+-d$BLACKLIST} ${WHITELIST:+-a$WHITELIST} && true + ./test_progs-no_alu32 ${DENYLIST:+-d$DENYLIST} ${ALLOWLIST:+-a$ALLOWLIST} && true echo "test_progs-no_alu32:$?" >> "${STATUS_FILE}" foldable end test_progs-no_alu32 } @@ -50,8 +50,8 @@ test_verifier() { foldable end vm_init configs_path=${PROJECT_NAME}/vmtest/configs -BLACKLIST=$(read_lists "$configs_path/blacklist/BLACKLIST-${KERNEL}" "$configs_path/blacklist/BLACKLIST-${KERNEL}.${ARCH}") -WHITELIST=$(read_lists "$configs_path/whitelist/WHITELIST-${KERNEL}" "$configs_path/whitelist/WHITELIST-${KERNEL}.${ARCH}") +DENYLIST=$(read_lists "$configs_path/DENYLIST-${KERNEL}" "$configs_path/DENYLIST-${KERNEL}.${ARCH}") +ALLOWLIST=$(read_lists "$configs_path/ALLOWLIST-${KERNEL}" "$configs_path/ALLOWLIST-${KERNEL}.${ARCH}") cd ${PROJECT_NAME}/selftests/bpf