aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2019-12-21 13:45:09 +0100
committerSören Tempel <soeren+git@soeren-tempel.net>2019-12-21 13:55:28 +0100
commit508000a974a6c79336ca7f7ce9be113153d879e7 (patch)
treef16d5c7cfdf80ebe7f873840557aa2c5c78e280a
parent6851dfb94ae8a53cd4e23f48bd3d17954b5da061 (diff)
downloadaports-508000a974a6c79336ca7f7ce9be113153d879e7.tar.gz
aports-508000a974a6c79336ca7f7ce9be113153d879e7.tar.bz2
aports-508000a974a6c79336ca7f7ce9be113153d879e7.tar.xz
testing/bmake: run test separately
-rw-r--r--testing/bmake/APKBUILD15
-rw-r--r--testing/bmake/separate-tests.patch26
2 files changed, 36 insertions, 5 deletions
diff --git a/testing/bmake/APKBUILD b/testing/bmake/APKBUILD
index e2267172c0..ee4dd7796c 100644
--- a/testing/bmake/APKBUILD
+++ b/testing/bmake/APKBUILD
@@ -8,16 +8,20 @@ arch="x86_64"
license="BSD-2-Clause"
subpackages="$pkgname-doc"
source="http://www.crufty.net/ftp/pub/sjg/bmake-$pkgver.tar.gz
- install-sh.patch"
-
+ install-sh.patch
+ separate-tests.patch"
builddir="$srcdir/$pkgname"
-options="!check" # Check automatically performed after build
build() {
cd "$builddir"
mkdir -p build
cd build
- sh ../boot-strap --with-default-sys-path=/usr/share/mk
+ sh ../boot-strap --with-default-sys-path=/usr/share/mk op=build
+}
+
+check() {
+ cd "$builddir/build"
+ sh ../boot-strap op=test
}
package() {
@@ -31,4 +35,5 @@ package() {
}
sha512sums="7824fb60e4ac8f9c5ab9f6a0d42720c5f3cb475851146bf8042625eb58bbd0dbacafce6969da2b51cdd6514e789a8f2a958e8b8538cd862eeea1b571da203e5b bmake-20181221.tar.gz
-0de9022a2991c5ef02c09ab592a3e2d218cd0bbf58e54f21bc7694110f3dd9e4589bf2b3d241fd167fb220b425007863f20e71e141b4f65bf92d305ba94209da install-sh.patch"
+0de9022a2991c5ef02c09ab592a3e2d218cd0bbf58e54f21bc7694110f3dd9e4589bf2b3d241fd167fb220b425007863f20e71e141b4f65bf92d305ba94209da install-sh.patch
+04217b04aca4252f54c836e982d95106a09166370f84fa672c418d1b1799adb9697f5ac9eb10a6ee3a8527e39196a37ad92bb5945733407bf9ec1a7f223183bb separate-tests.patch"
diff --git a/testing/bmake/separate-tests.patch b/testing/bmake/separate-tests.patch
new file mode 100644
index 0000000000..0e306652c1
--- /dev/null
+++ b/testing/bmake/separate-tests.patch
@@ -0,0 +1,26 @@
+By default tests are run on build and install. Normally, Alpine
+tests are invoked separately in a check stage. To allow doing
+that this patch disable the automatic test invocations during build and
+install.
+
+diff -upr bmake.orig/boot-strap bmake/boot-strap
+--- bmake.orig/boot-strap 2019-12-21 13:39:52.658136365 +0100
++++ bmake/boot-strap 2019-12-21 13:40:25.954816539 +0100
+@@ -414,9 +414,6 @@ op_build() {
+ [ -s make-bootstrap.sh ] || op_configure
+ chmod 755 make-bootstrap.sh || exit 1
+ ./make-bootstrap.sh || exit 1
+- case "$op" in
+- build) op_test;;
+- esac
+ }
+
+ op_test() {
+@@ -435,7 +432,6 @@ op_clean() {
+ }
+
+ op_install() {
+- op_test
+ case "$INSTALL_PREFIX,$INSTALL_BIN,$prefix" in
+ ,$HOST_TARGET/bin,*/$HOST_TARGET)
+ INSTALL_PREFIX=`dirname $prefix`