summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-10-03 12:29:57 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-10-03 12:37:08 +0000
commit0bf61ee06a6c91695111202650a440297c405e2d (patch)
tree88f364f888537988b3850a13489bbfd3f1afe1e5
parent3379e675512dfdde74a9048af80db825e9ebdb07 (diff)
downloadabuild-0bf61ee06a6c91695111202650a440297c405e2d.tar.bz2
abuild-0bf61ee06a6c91695111202650a440297c405e2d.tar.xz
abuild: do not run check in fakeroot by default
Only run check in fakeroot if options="checkroot" is set. This makes options="!checkroot" the default. I expect most checks work as non-root, and if a testsuite requires root, it will likely fail in fakeroot too. Fakeroot has also shown lower performance for parallel builds.
-rw-r--r--APKBUILD.57
-rw-r--r--abuild.in12
2 files changed, 9 insertions, 10 deletions
diff --git a/APKBUILD.5 b/APKBUILD.5
index 67f2eaa..81a74ae 100644
--- a/APKBUILD.5
+++ b/APKBUILD.5
@@ -298,11 +298,10 @@ Do not use this option.
.It Cm !check
Specifies that the package will not run a test suite.
The reason for disabling the check phase should be noted in a comment.
-.It Cm !checkroot
-Specifies that the package's test suite will be run as a non-privileged user
-instead of using
+.It Cm checkroot
+Specifies that the package's test suite will be run in
.Xr fakeroot 8 .
-This is necessary for some test suites which fail when run as root.
+This is necessary for some test suites which fail when run as non-root.
.It Cm !dbg
Specifies that the package should not be built with a debug information
package.
diff --git a/abuild.in b/abuild.in
index 6271f8c..697af2a 100644
--- a/abuild.in
+++ b/abuild.in
@@ -1508,9 +1508,9 @@ create_apks() {
}
build_abuildrepo() {
- local d apk _check=check_fakeroot
- if options_has "!checkroot"; then
- _check=check
+ local _check=check
+ if options_has "checkroot"; then
+ _check=check_fakeroot
fi
if ! want_check; then
_check=true
@@ -2125,9 +2125,9 @@ checksum() {
}
rootbld_actions() {
- local part _check=check_fakeroot
- if options_has "!checkroot"; then
- _check=check
+ local part _check=check
+ if options_has "checkroot"; then
+ _check=check_fakeroot
fi
if ! want_check; then
_check=true