From a947590adaf68b1f08a7fca6b5a03f278a485739 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 9 Oct 2015 23:03:43 +0200 Subject: tests: change test-skipping detection for arch-specific pkgs dpkg-checkbuilddeps changed its exitcodes in the recent past so the old check always fails now skipping the test. Lets try a slightly more stable (at least assume it to be) variant of detecting this. See also 4f6d26b4d41474aa390329b7e9cb167eb70b2821. Git-Dch: Ignore --- test/integration/test-bug-747261-arch-specific-conflicts | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'test/integration/test-bug-747261-arch-specific-conflicts') diff --git a/test/integration/test-bug-747261-arch-specific-conflicts b/test/integration/test-bug-747261-arch-specific-conflicts index be971b89e..08e66a7cd 100755 --- a/test/integration/test-bug-747261-arch-specific-conflicts +++ b/test/integration/test-bug-747261-arch-specific-conflicts @@ -6,15 +6,10 @@ TESTDIR=$(readlink -f $(dirname $0)) setupenvironment configarchitecture 'amd64' 'sparc' 'armel' +insertinstalledpackage 'foobar' 'armel' '1' msgtest 'Check that dpkg supports' 'arch-specific dependencies' -set +e -# this fails always, the question is just how it fails -dpkg-checkbuilddeps -d 'foobar:barfoo' /dev/null 2>/dev/null >/dev/null -RETURNCODE=$? -set -e -if [ "$RETURNCODE" != '1' ]; then - dpkg-checkbuilddeps -d 'foobar:barfoo' /dev/null || true - echo "Command had returncode: $RETURNCODE" +if ! dpkgcheckbuilddeps -d 'foobar:armel' /dev/null 2>/dev/null >/dev/null; then + dpkgcheckbuilddeps -d 'foobar:armel' /dev/null || true msgskip exit 0 else -- cgit v1.2.3