Merge pull request #18029 from bluca/minor_fixes

Minor test script runner and labeller bot fixes
This commit is contained in:
Yu Watanabe 2020-12-20 10:01:59 +09:00 committed by GitHub
commit 87cc47ba1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 7 deletions

14
.github/labeler.yml vendored
View File

@ -4,7 +4,6 @@ units:
- units/**/*
documentation:
- NEWS
- man/*
- docs/*
network:
- src/libsystemd-network/**/*
@ -17,8 +16,10 @@ selinux:
apparmor:
- '**/*apparmor*'
meson:
- '**/meson.build'
- meson_option.txt
mkosi:
- .mkosi/*
- mkosi.build
busctl:
- src/busctl/*
systemctl:
@ -27,3 +28,12 @@ journal:
- src/journal/*
journal-remote:
- src/journal-remote/*
portable:
- src/portable/**/*
resolve:
- src/resolve/*
timedate:
- src/timedate/*
timesync:
- src/timesync/*
- src/time-wait-sync/*

View File

@ -7,7 +7,7 @@ if [ $# -gt 0 ]; then
else
args="setup run clean-again"
fi
args_no_clean=$(sed -r 's/\bclean\b//g' <<<$args)
args_no_clean=$(sed -r 's/\bclean.*\b//g' <<<$args)
do_clean=$( [ "$args" = "$args_no_clean" ]; echo $? )
ninja -C "$BUILD_DIR"
@ -30,10 +30,10 @@ if [ $do_clean = 1 ]; then
[ -n "$args_no_clean" ] || exit 0
fi
pass_blacklist() {
for marker in $BLACKLIST_MARKERS; do
pass_deny_list() {
for marker in $DENY_LIST_MARKERS $BLACKLIST_MARKERS; do
if [ -f "$1/$marker" ]; then
echo "========== BLACKLISTED: $1 ($marker) =========="
echo "========== DENY-LISTED: $1 ($marker) =========="
return 1
fi
done
@ -43,7 +43,7 @@ pass_blacklist() {
for TEST in TEST-??-* ; do
COUNT=$(($COUNT+1))
pass_blacklist $TEST || continue
pass_deny_list $TEST || continue
start=$(date +%s)
echo -e "\n--x-- Running $TEST --x--"