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