aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2017-04-12 14:18:32 +0200
committerJakub Jirutka <jakub@jirutka.cz>2017-04-12 14:20:02 +0200
commit920f2f97d9a9a939ad1fa3766036d34a1b6f2e96 (patch)
treec5988470cbb468cf73c04eb5c7412f86a9a8b518 /testing
parentd05b0bdd6b489ab31a22904e55447ba0e84ba4f3 (diff)
downloadaports-920f2f97d9a9a939ad1fa3766036d34a1b6f2e96.tar.bz2
aports-920f2f97d9a9a939ad1fa3766036d34a1b6f2e96.tar.xz
testing/cargo: add check(), but ignore test failures for now
Diffstat (limited to 'testing')
-rw-r--r--testing/cargo/APKBUILD23
1 files changed, 19 insertions, 4 deletions
diff --git a/testing/cargo/APKBUILD b/testing/cargo/APKBUILD
index b8b980953d..284f7feb1f 100644
--- a/testing/cargo/APKBUILD
+++ b/testing/cargo/APKBUILD
@@ -24,6 +24,11 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/rust-lang/$pkgname/archive/$
cargo-$_bootstrap_gitrev-$_ctarget.tar.gz::https://s3.amazonaws.com/rust-lang-ci/cargo-builds/$_bootstrap_gitrev/cargo-nightly-$_ctarget.tar.gz"
builddir="$srcdir/$pkgname-$pkgver"
+_bootstrap_cargo="$srcdir/cargo-nightly-$_ctarget/cargo/bin/cargo"
+
+export CARGOFLAGS="--locked"
+export CARGO_HOME="$srcdir/.cargo"
+
prepare() {
default_prepare
cd "$builddir"
@@ -38,16 +43,26 @@ build() {
./configure \
--prefix=/usr \
--release-channel=stable \
- --cargo="$srcdir/cargo-nightly-$_ctarget/cargo/bin/cargo"
+ --cargo="$_bootstrap_cargo"
# LIBGIT2... Convince libgit2-sys to use the distro libgit2.
- make CARGOFLAGS="--locked" \
- CARGO_HOME="$srcdir/.cargo" \
- LIBGIT2_SYS_USE_PKG_CONFIG=1 \
+ make LIBGIT2_SYS_USE_PKG_CONFIG=1 \
RUSTFLAGS="-C target-feature=-crt-static" \
VERBOSE=1
}
+check() {
+ cd "$builddir"
+
+ ./target/$_ctarget/release/cargo --version
+
+ # XXX: ignore test failures for now
+ CARGO_HOME="$srcdir/.cargo" \
+ CFG_DISABLE_CROSS_TESTS=1 \
+ RUSTFLAGS="-C target-feature=-crt-static" \
+ "$_bootstrap_cargo" test --release --target "$_ctarget" || true
+}
+
package() {
cd "$builddir"