mirror of
https://gitlab.alpinelinux.org/alpine/abuild.git
synced 2025-03-01 09:50:31 +00:00
checkapk: dont require abuild.conf if we have default conf
also add tests
This commit is contained in:
parent
643637dd5d
commit
fab41364f7
@ -51,7 +51,7 @@ if [ $# -gt 0 ]; then
|
||||
exit 2
|
||||
fi
|
||||
|
||||
if ! [ -f "$ABUILD_CONF" ] && ! [ -f "$ABUILD_USERCONF" ]; then
|
||||
if ! [ -f "$ABUILD_CONF" ] && ! [ -f "$ABUILD_USERCONF" ] && ! [ -f "$ABUILD_DEFCONF" ]; then
|
||||
die "no abuild.conf found"
|
||||
fi
|
||||
|
||||
|
@ -3,10 +3,16 @@
|
||||
. $(atf_get_srcdir)/test_env.sh
|
||||
init_tests \
|
||||
checkapk_help \
|
||||
checkapk_invalid_opt
|
||||
checkapk_invalid_opt \
|
||||
checkapk_missing_abuild_conf \
|
||||
checkapk_missing_apkbuild
|
||||
|
||||
DATADIR=$(atf_get_srcdir)/testdata
|
||||
|
||||
export ABUILD_SHAREDIR=$(atf_get_srcdir)/..
|
||||
export ABUILD_CONF=/dev/null
|
||||
export ABUILD_USERCONF=/dev/null
|
||||
|
||||
checkapk_help_body() {
|
||||
atf_check -s exit:0 \
|
||||
-o match:"Usage:" \
|
||||
@ -18,3 +24,17 @@ checkapk_invalid_opt_body() {
|
||||
-e match:"Usage:" \
|
||||
checkapk --invalid
|
||||
}
|
||||
|
||||
checkapk_missing_abuild_conf_body() {
|
||||
ABUILD_DEFCONF=/dev/null atf_check \
|
||||
-s not-exit:0 \
|
||||
-e match:"no abuild.conf found" \
|
||||
checkapk
|
||||
}
|
||||
|
||||
checkapk_missing_apkbuild_body() {
|
||||
atf_check \
|
||||
-s not-exit:0 \
|
||||
-e match:"must be run in the directory of a built package" \
|
||||
checkapk
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user