From fab41364f7bd30a87d96152d3ebc09eca84b60c3 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 18 Oct 2023 11:22:47 +0200
Subject: [PATCH] checkapk: dont require abuild.conf if we have default conf
also add tests
---
checkapk.in | 2 +-
tests/checkapk_test | 22 +++++++++++++++++++++-
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/checkapk.in b/checkapk.in
index d705fad8..0473b12b 100644
--- a/checkapk.in
+++ b/checkapk.in
@@ -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
diff --git a/tests/checkapk_test b/tests/checkapk_test
index 396467bc..b621e8cb 100755
--- a/tests/checkapk_test
+++ b/tests/checkapk_test
@@ -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
+}
--
GitLab