proxmox-mirrors/systemd
1
0
Fork 0
mirror of https://git.proxmox.com/git/systemd synced 2026-01-06 12:32:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

d/t/upstream: convert 'blacklist' term to 'deny-list'

Browse Source 
Support transition for upstream-ci from
https://github.com/systemd/systemd/pull/16262
This commit is contained in:
Dan Streetman 2020-07-10 16:24:30 -04:00 committed by Michael Biebl
parent 1b564a7c99
commit 89b1131248
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
debian/tests/upstream vendored
View File

@ -19,21 +19,25 @@ sed -i 's_/usr/libexec/selinux/hll/pp_/usr/lib/selinux/hll/pp_' test/TEST-06-SEL
FAILED=""
# Because this test is used both by upstream and by Debian, we use different blacklist filenames.
# Because this test is used both by upstream and by Debian, we use different deny-list filenames.
# For more details see https://salsa.debian.org/systemd-team/systemd/merge_requests/52
# The naming is transitioning from blacklist to deny-list, so currently both are supported
# More details in https://github.com/systemd/systemd/pull/16262
if [ -n "$TEST_UPSTREAM" ]; then
DENY_LIST="deny-list-ubuntu-ci"
BLACKLIST="blacklist-ubuntu-ci"
else
DENY_LIST="deny-list-upstream-ci"
BLACKLIST="blacklist-upstream-ci"
fi
for t in test/TEST*; do
testname=$(basename $t)
if [ -f "$t/$BLACKLIST" ]; then
echo "========== BLACKLISTED: $testname =========="
if [ -f "$t/${DENY_LIST}" -o -f "$t/${BLACKLIST}" ]; then
echo "========== DENY-LISTED: $testname =========="
continue
elif [ -f "$t/$BLACKLIST-$DPKGARCH" ]; then
echo "========== BLACKLISTED (for arch $DPKGARCH): $testname =========="
elif [ -f "$t/${DENY_LIST}-$DPKGARCH" -o -f "$t/${BLACKLIST}-$DPKGARCH" ]; then
echo "========== DENY-LISTED (for arch $DPKGARCH): $testname =========="
continue
fi
echo "========== START: $testname =========="