X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by lists.alpinelinux.org (Postfix) with ESMTP id 7BF8C5C41A1 for ; Sun, 10 Jul 2016 00:32:11 +0000 (GMT) Received: by mail-wm0-f68.google.com with SMTP id k123so12241917wme.2 for ; Sat, 09 Jul 2016 17:32:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=u8IP1RV/5M33uIiXgBbz27r6tgD2gCzQWWGmH6v8nmg=; b=XURTWn7y1I6bMO7XQk90LRcnafKcnZ9/rkws811Oy5yRSH6DV0gNrvPFHc9fTUFVtF Pt8uixoXCDIwcUG5nEMV7DGcUY3FaG0d2bSZSYYaH1VJTBFgv4dba9t8lHCUZ5NUujc9 gv3XJIrYjApB89R17FijGfR6r2d3J0d/Mn9e5/GCdtta33DQzUKcH3wGm455Q6v7+DRz mj5Nso0tO4QlJ1R1DWEkwXNgv12sPLAQ1TYg/jUmE/mkxUNdCSKFN+nS8ZPzmNQF3YCj UadGGZY/hzSUmPRKKWTKbt1acnLTze8deEvBSD6dVoc8KiCvsoXfPnr5ixYCRUA8CZ4w gnYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=u8IP1RV/5M33uIiXgBbz27r6tgD2gCzQWWGmH6v8nmg=; b=bPs1w4kCVGHgANNMKoJXkYS7/gpsJsgZ0o6uPjrFFM6UKDH2gCNzBjLIpIQ8K3AEm2 QAqr1/OjCfAX7SpFFk2wMlivCvhzznA04AKSGDtawEF+2iZiy9kJJgYvyFkwjBz/DYim VfjhE6ckijF4NtdWXZ5ziPs/a5mR90AmAKiD+pyiEptekBunh/xVWNUg8ULM4mqSAbBM M4DwOQmWfFctpnAbAGizbAkyPj5O/ORY/1fk20MzTL+15wkfy+leVwAqOIYASOvTObAM z76uGQ6T3FBqkGwlRZlczD2Gc/lRcXq62WH0HS/3g3uTGC46pSry1RQD46nFrWP3+6GL RkJw== X-Gm-Message-State: ALyK8tIWTZBMpOMXJlKAuhR2l31x6oarH+cd6gF/8wbIUvGWVSKhaP0fojFYex7GJTgeaQ== X-Received: by 10.194.85.161 with SMTP id i1mr12318471wjz.95.1468110730822; Sat, 09 Jul 2016 17:32:10 -0700 (PDT) Received: from localhost.localdomain ([46.166.188.233]) by smtp.gmail.com with ESMTPSA id mn2sm4130708wjc.35.2016.07.09.17.32.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 09 Jul 2016 17:32:09 -0700 (PDT) From: Michael Koloberdin To: alpine-aports@lists.alpinelinux.org Cc: Michael Koloberdin Subject: [alpine-aports] [PATCH] testing/patchelf: Fix the test that should not fail Date: Sun, 10 Jul 2016 00:31:54 +0000 Message-Id: <20160710003155.32498-1-koloberdin@gmail.com> X-Mailer: git-send-email 2.9.0 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- testing/patchelf/APKBUILD | 18 ++++++++++-------- testing/patchelf/fix-tests.patch | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 testing/patchelf/fix-tests.patch diff --git a/testing/patchelf/APKBUILD b/testing/patchelf/APKBUILD index 735fff3..ed5b4fe 100644 --- a/testing/patchelf/APKBUILD +++ b/testing/patchelf/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michael Koloberdin pkgname=patchelf pkgver=0.9 -pkgrel=0 +pkgrel=1 pkgdesc="Small utility to modify the dynamic linker and RPATH of ELF executables" url="https://nixos.org/patchelf.html" arch="all" @@ -11,11 +11,13 @@ depends="" makedepends="autoconf automake" install="" subpackages="$pkgname-doc" -source="${pkgname}-${pkgver}.tar.gz::https://github.com/NixOS/patchelf/archive/${pkgver}.tar.gz" +source="${pkgname}-${pkgver}.tar.gz::https://github.com/NixOS/patchelf/archive/${pkgver}.tar.gz + fix-tests.patch" builddir="$srcdir/$pkgname-$pkgver" prepare() { cd "$builddir" + default_prepare autoreconf -fiv || return 1 } @@ -23,9 +25,6 @@ build() { cd "$builddir" ./configure --prefix=/usr || return 1 make || return 1 -} - -check() { make -C tests -j1 check || return 1 } @@ -34,6 +33,9 @@ package() { make DESTDIR="${pkgdir}" install || return 1 } -md5sums="69c94a4400e930f938b754d543705eb9 patchelf-0.9.tar.gz" -sha256sums="cf0693e794229e19edcf2299427b5a352e0f4d4f06f9d3856e30ddb0344d5ce8 patchelf-0.9.tar.gz" -sha512sums="70e615f2f705f413aab5e3eebe20ffe79743bb92381b10a8faa49f16ca24b0f9bd4095c5644f682ec94d75012ffb1b39837933faa9f3c1f1c41bdc5b9d010a30 patchelf-0.9.tar.gz" +md5sums="69c94a4400e930f938b754d543705eb9 patchelf-0.9.tar.gz +39250eb2b2261bac6344b4e0bba08a9c fix-tests.patch" +sha256sums="cf0693e794229e19edcf2299427b5a352e0f4d4f06f9d3856e30ddb0344d5ce8 patchelf-0.9.tar.gz +7e8c1d25ee815ab0cd644c5cfe76f87b83877146a5e2252236ceb407fbcaf883 fix-tests.patch" +sha512sums="70e615f2f705f413aab5e3eebe20ffe79743bb92381b10a8faa49f16ca24b0f9bd4095c5644f682ec94d75012ffb1b39837933faa9f3c1f1c41bdc5b9d010a30 patchelf-0.9.tar.gz +f52c519e1b43481b44ac24060a05a1f027468627e9bf6e75055a1ae480f53a4ce141923adcaacea1370a8ef3bdbf12edbf479e348b6aecc0f0d1eba0cdf23ec8 fix-tests.patch" diff --git a/testing/patchelf/fix-tests.patch b/testing/patchelf/fix-tests.patch new file mode 100644 index 0000000..386235a --- /dev/null +++ b/testing/patchelf/fix-tests.patch @@ -0,0 +1,14 @@ +diff -urp patchelf-0.9-orig/tests/set-rpath-library.sh patchelf-0.9/tests/set-rpath-library.sh +--- patchelf-0.9-orig/tests/set-rpath-library.sh 2016-02-29 12:15:58.000000000 +0200 ++++ patchelf-0.9/tests/set-rpath-library.sh 2016-07-10 03:09:55.365997370 +0300 +@@ -26,7 +26,9 @@ exitCode=0 + + if test "$exitCode" = 46; then + echo "expected failure" +- exit 1 ++# exit 1 ++# As it is an "expected failure" the test should not exit but should go on. ++# See the comment below. + fi + + # So set an RUNPATH on libfoo as well. -- 2.9.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---