From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [RFC] enable tests in CI and introduce XBPS_CHECK_PKGS=full
Date: Tue, 08 Dec 2020 16:37:05 +0100 [thread overview]
Message-ID: <20201208153705.rE1s2pIsS_mlK9xw5H2gxJttUtPcfL2YLuVlAEV2NMc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26773@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 465 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages ci
https://github.com/void-linux/void-packages/pull/26773
[RFC] enable tests in CI and introduce XBPS_CHECK_PKGS=full
This probably needs some work in templates to define a cheap `do_check` and a more expensive `do_all_checks` or whatever.
A patch file from https://github.com/void-linux/void-packages/pull/26773.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ci-26773.patch --]
[-- Type: text/x-diff, Size: 10660 bytes --]
From 4202603412f730c07f84f425d7440b2cfe0693ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 7 Dec 2020 20:15:42 -0300
Subject: [PATCH 1/6] xbps-src: add -K option for running the full testsuite.
Some packages have rather long test suites, with an option for a shorter
one. With this option, one can choose between shorter tests (-Q) or the
complete longer ones (-K).
This also allows CI to run only the shorter testsuites.
Make the appropriate changes to etc/default.conf and Manual.md as well.
---
Manual.md | 3 +++
etc/defaults.conf | 2 ++
xbps-src | 5 ++++-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/Manual.md b/Manual.md
index 7647f957129..4b0d678a757 100644
--- a/Manual.md
+++ b/Manual.md
@@ -364,6 +364,9 @@ rather than additional binary package names.
- `CROSS_BUILD` Set if `xbps-src` is cross compiling a package.
+- `XBPS_CHECK_PKGS` Set if `xbps-src` is going to run tests for a package.
+Longer testsuites should only be run in `do_check()` if it is set to `full`.
+
- `DESTDIR` Full path to the fake destdir used by the source pkg, set to
`<masterdir>/destdir/${sourcepkg}-${version}`.
diff --git a/etc/defaults.conf b/etc/defaults.conf
index 6e297903fbd..88286deaa6f 100644
--- a/etc/defaults.conf
+++ b/etc/defaults.conf
@@ -71,8 +71,10 @@ XBPS_SUCMD="sudo /bin/sh -c"
# [OPTIONAL]
# Enable running the (optional) do_check() function of a package.
+# When set to 'full', will enable further testing for some packages.
#
#XBPS_CHECK_PKGS=yes
+#XBPS_CHECK_PKGS=full
# [OPTIONAL]
# Enable building -dbg subpackages with debugging symbols. Please note
diff --git a/xbps-src b/xbps-src
index 08da501f219..c06d067c060 100755
--- a/xbps-src
+++ b/xbps-src
@@ -205,6 +205,8 @@ $(print_cross_targets)
-Q Enable running the check stage.
+-K Enable running the check stage with longer tests.
+
-q Suppress informational output of xbps-src (build output is still printed).
-r <repo>
@@ -382,6 +384,7 @@ while getopts "$XBPS_OPTSTRING" opt; do
p) XBPS_ARG_PRINT_VARIABLES="$OPTARG"; XBPS_OPTIONS+=" -p $OPTARG";;
q) XBPS_ARG_QUIET=1; XBPS_OPTIONS+=" -q";;
Q) XBPS_ARG_CHECK_PKGS=1; XBPS_OPTIONS+=" -Q";;
+ K) XBPS_ARG_CHECK_PKGS=full; XBPS_OPTIONS+=" -K";;
r) XBPS_ARG_ALT_REPOSITORY="$OPTARG"; XBPS_OPTIONS+=" -r $OPTARG";;
t) XBPS_ARG_TEMP_MASTERDIR=1; XBPS_OPTIONS+=" -t -C";;
V) echo "xbps-src-$XBPS_SRC_VERSION $(xbps-uhelper -V)" && exit 0;;
@@ -459,7 +462,6 @@ fi
[ -n "$XBPS_ARG_TEMP_MASTERDIR" ] && XBPS_TEMP_MASTERDIR=1
[ -n "$XBPS_ARG_BINPKG_EXISTS" ] && XBPS_BINPKG_EXISTS=1
[ -n "$XBPS_ARG_USE_GIT_REVS" ] && XBPS_USE_GIT_REVS=1
-[ -n "$XBPS_ARG_CHECK_PKGS" ] && XBPS_CHECK_PKGS=1
[ -n "$XBPS_ARG_DEBUG_PKGS" ] && XBPS_DEBUG_PKGS=1
[ -n "$XBPS_ARG_SKIP_DEPS" ] && XBPS_SKIP_DEPS=1
[ -n "$XBPS_ARG_KEEP_ALL" ] && XBPS_KEEP_ALL=1
@@ -467,6 +469,7 @@ fi
[ -n "$XBPS_ARG_PRINT_VARIABLES" ] && XBPS_PRINT_VARIABLES="$XBPS_ARG_PRINT_VARIABLES"
[ -n "$XBPS_ARG_ALT_REPOSITORY" ] && XBPS_ALT_REPOSITORY="$XBPS_ARG_ALT_REPOSITORY"
[ -n "$XBPS_ARG_CROSS_BUILD" ] && XBPS_CROSS_BUILD="$XBPS_ARG_CROSS_BUILD"
+[ -n "$XBPS_ARG_CHECK_PKGS" ] && XBPS_CHECK_PKGS="$XBPS_ARG_CHECK_PKGS"
[ -n "$XBPS_ARG_MAKEJOBS" ] && XBPS_MAKEJOBS="$XBPS_ARG_MAKEJOBS"
export XBPS_BUILD_ONLY_ONE_PKG XBPS_SKIP_REMOTEREPOS XBPS_BUILD_FORCEMODE \
From fb9da31e5f45d949869a504c5a53f4f842aec25b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 2 Dec 2020 15:06:37 -0300
Subject: [PATCH 2/6] common/travis/fetch-xtools: make it work inside
masterdir.
---
common/travis/fetch-xtools.sh | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/common/travis/fetch-xtools.sh b/common/travis/fetch-xtools.sh
index 7abf44bcc12..0dd9e6c532c 100755
--- a/common/travis/fetch-xtools.sh
+++ b/common/travis/fetch-xtools.sh
@@ -2,9 +2,18 @@
#
# fetch-xtools.sh
+TAR=tar
+command -v bsdtar >/dev/null && TAR=bsdtar
+URL="https://github.com/leahneukirchen/xtools/archive/master.tar.gz"
+FILE="xtools.tar.gz"
+
mkdir -p /tmp/bin
/bin/echo -e '\x1b[32mInstalling xtools...\x1b[0m'
-wget -q -O - https://github.com/leahneukirchen/xtools/archive/master.tar.gz | \
- gunzip | tar x -C /tmp/bin --wildcards "xtools-master/x*" \
- --strip-components=1 || exit 1
+if command -v wget >/dev/null; then
+ wget -q -O "$FILE" "$URL" || exit 1
+else
+ xbps-fetch -o "$FILE" "$URL" || exit 1
+fi
+
+$TAR xf "$FILE" -C /tmp/bin --strip-components=1 || exit 1
From 139095cc12475cd6953fe2c41bf26fc36845b7c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 2 Dec 2020 15:30:48 -0300
Subject: [PATCH 3/6] common/travis/build.sh: don't clean masterdir for native
builds.
This allows tests to be run in a separate step without rebuilding
everything.
Also use nproc(1) directly.
---
common/travis/build.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/travis/build.sh b/common/travis/build.sh
index 1c45910ea69..6530afd906d 100755
--- a/common/travis/build.sh
+++ b/common/travis/build.sh
@@ -6,17 +6,17 @@ if [ "$1" != "$2" ]; then
arch="-a $2"
fi
-PKGS=$(/hostrepo/xbps-src sort-dependencies $(cat /tmp/templates))
-
-NPROCS=1
-if [ -r /proc/cpuinfo ]; then
- NPROCS=$(grep ^proc /proc/cpuinfo|wc -l)
+# keep builddir so tests can be run without rebuilding everything
+if [ "$3" = 1 ]; then
+ test="-C"
fi
+PKGS=$(/hostrepo/xbps-src sort-dependencies $(cat /tmp/templates))
+
export FTP_RETRIES=10
for pkg in ${PKGS}; do
- /hostrepo/xbps-src -j$NPROCS -H "$HOME"/hostdir $arch pkg "$pkg"
+ /hostrepo/xbps-src -j$(nproc) -H "$HOME"/hostdir $arch $test pkg "$pkg"
[ $? -eq 1 ] && exit 1
done
From 58afb42045b8427c29b4a01e53e8268d541a4d6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 2 Dec 2020 15:31:32 -0300
Subject: [PATCH 4/6] common/travis/test.sh: create file.
---
common/travis/test.sh | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100755 common/travis/test.sh
diff --git a/common/travis/test.sh b/common/travis/test.sh
new file mode 100755
index 00000000000..a50d4274b26
--- /dev/null
+++ b/common/travis/test.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# test.sh
+
+if [ "$1" != 1 ]; then
+ echo "Skipping tests..."
+ exit 0
+fi
+
+PKGS=$(cat /tmp/templates)
+
+export FTP_RETRIES=10
+
+for pkg in ${PKGS}; do
+ /hostrepo/xbps-src -j$(nproc) -H "$HOME"/hostdir -Q check "$pkg"
+ [ $? -eq 1 ] && exit 1
+done
+
+exit 0
From f60586f4d35a13060f79f803ebc96294c2438eff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 28 Nov 2020 15:47:04 -0300
Subject: [PATCH 5/6] .github/workflows: run tests on CI for native builds.
Also fix "list contents" step by adding a fetch-xtools step.
---
.github/workflows/build.yaml | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 33186037f8d..79d4368d77c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -34,19 +34,20 @@ jobs:
PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
ARCH: '${{ matrix.config.arch }}'
BOOTSTRAP: '${{ matrix.config.bootstrap }}'
+ TEST: '${{ matrix.config.test }}'
HOSTREPO: /hostrepo
strategy:
fail-fast: false
matrix:
config:
- - { arch: x86_64, bootstrap: x86_64 }
- - { arch: i686, bootstrap: i686 }
- - { arch: aarch64, bootstrap: x86_64 }
- - { arch: armv7l, bootstrap: x86_64 }
- - { arch: x86_64-musl, bootstrap: x86_64-musl }
- - { arch: armv6l-musl, bootstrap: x86_64-musl }
- - { arch: aarch64-musl, bootstrap: x86_64-musl }
+ - { arch: x86_64, bootstrap: x86_64, test: 1 }
+ - { arch: i686, bootstrap: i686, test: 1 }
+ - { arch: aarch64, bootstrap: x86_64, test: 0 }
+ - { arch: armv7l, bootstrap: x86_64, test: 0 }
+ - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+ - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
+ - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
steps:
- name: Prepare container
@@ -73,9 +74,18 @@ jobs:
(
here="$(pwd)"
cd /
- "$here/common/travis/build.sh" "$BOOTSTRAP" "$ARCH"
+ "$here/common/travis/build.sh" "$BOOTSTRAP" "$ARCH" "$TEST"
)
+ - name: Check packages
+ run: |
+ (
+ here="$(pwd)"
+ cd /
+ "$here/common/travis/test.sh" "$TEST"
+ )
+
+ - run: common/travis/fetch-xtools.sh
- name: Show files
run: |
(
From a8143337b1c7ff94e6d6a817d622e887d22db75f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 7 Dec 2020 20:15:12 -0300
Subject: [PATCH 6/6] libaom: split tests by duration.
---
srcpkgs/libaom/template | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libaom/template b/srcpkgs/libaom/template
index 93f1983edfc..a8a9b5d869e 100644
--- a/srcpkgs/libaom/template
+++ b/srcpkgs/libaom/template
@@ -1,6 +1,6 @@
# Template file for 'libaom'
pkgname=libaom
-version=2.0.0
+version=2.0.1
revision=1
create_wrksrc=yes
build_style=cmake
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
homepage="https://aomedia.org/"
changelog="https://aomedia.googlesource.com/aom/+/master/CHANGELOG"
distfiles="https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"
-checksum=@4e8a74ed7e05d5534ab0b72735fa670ce1a1e757bc4a777f07fdabf8629fced1
+checksum=@b89acd3304531a9f6c99eba13e1de66605893ff8d08abc8c6e0586481a90033a
# aom segfaults with default musl stack size
LDFLAGS="-Wl,-z,stack-size=2097152"
@@ -28,15 +28,25 @@ if [ -z "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DENABLE_TESTS=OFF"
fi
+post_patch() {
+ # test suite assumes that git being available means it's
+ # in a git repository
+ vsed -e "s/git --version/false/" -i test/tools_common.sh
+}
+
pre_check() {
- mkdir -p /host/libaom-test-data
export LIBAOM_TEST_DATA_PATH=/host/libaom-test-data
+ mkdir -p $LIBAOM_TEST_DATA_PATH
}
do_check() {
cd build
- make runtests ${makejobs}
+ make testdata ${makejobs}
../test/examples.sh --bin-path examples
+
+ if [ "$XBPS_CHECK_PKGS" = full ]; then
+ make runtests ${makejobs}
+ fi
}
post_install() {
next prev parent reply other threads:[~2020-12-08 15:37 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26773@inbox.vuxu.org>
2020-12-02 18:14 ` [PR PATCH] [Updated] [RFC] enable tests in CI ericonr
2020-12-02 18:20 ` ericonr
2020-12-02 18:32 ` ericonr
2020-12-02 18:38 ` ericonr
2020-12-02 18:44 ` ericonr
2020-12-07 22:19 ` ericonr
2020-12-07 23:23 ` ericonr
2020-12-07 23:24 ` [RFC] enable tests in CI and introduce XBPS_CHECK_PKGS=full ericonr
2020-12-07 23:27 ` [PR PATCH] [Updated] " ericonr
2020-12-07 23:29 ` ericonr
2020-12-07 23:30 ` ericonr
2020-12-08 15:27 ` ericonr
2020-12-08 15:37 ` ericonr [this message]
2020-12-08 17:35 ` Chocimier
2020-12-08 18:19 ` ericonr
2020-12-12 6:54 ` [PR PATCH] [Updated] " ericonr
2020-12-14 2:20 ` ericonr
2020-12-14 2:22 ` [PR REVIEW] " sgn
2020-12-14 2:25 ` ericonr
2020-12-14 2:36 ` [PR PATCH] [Updated] " ericonr
2020-12-14 2:49 ` ericonr
2020-12-14 2:51 ` ericonr
2020-12-14 3:18 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201208153705.rE1s2pIsS_mlK9xw5H2gxJttUtPcfL2YLuVlAEV2NMc@z \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).