소스 검색

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
David Kalnischkies 10 년 전
부모
커밋
a947590ada
1개의 변경된 파일3개의 추가작업 그리고 8개의 파일을 삭제
  1. 3 8
      test/integration/test-bug-747261-arch-specific-conflicts

+ 3 - 8
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