Browse Source

fix output redirection order

First redirect output to a file, then redirect other outputs to this
output, not the other way around as this will not work.

Git-Dch: Ignore
tags/debian/0.9.10
David Kalnischkies 8 years ago
parent
commit
7a2690a3bf
4 changed files with 7 additions and 7 deletions
  1. +3
    -3
      test/integration/framework
  2. +1
    -1
      test/integration/skip-avoid-avoiding-breaks-predepends
  3. +2
    -2
      test/integration/test-bug-612099-multiarch-conflicts
  4. +1
    -1
      test/integration/test-bug-618288-multiarch-same-lockstep

+ 3
- 3
test/integration/framework View File

@@ -177,7 +177,7 @@ setupenvironment() {
echo "DPKG::options:: \"--root=${TMPWORKINGDIRECTORY}/rootdir\";" >> aptconfig.conf
echo "DPKG::options:: \"--force-not-root\";" >> aptconfig.conf
echo "DPKG::options:: \"--force-bad-path\";" >> aptconfig.conf
if ! $(which dpkg) --assert-multi-arch 2>&1 > /dev/null; then
if ! $(which dpkg) --assert-multi-arch >/dev/null 2>&1; then
echo "DPKG::options:: \"--force-architecture\";" >> aptconfig.conf # Added to test multiarch before dpkg is ready for it…
fi
echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf
@@ -225,7 +225,7 @@ configdpkg() {
echo -n > rootdir/var/lib/dpkg/status
fi
fi
if $(which dpkg) --assert-multi-arch 2>&1 > /dev/null; then
if $(which dpkg) --assert-multi-arch >/dev/null 2>&1; then
local ARCHS="$(getarchitectures)"
if echo "$ARCHS" | grep -E -q '[^ ]+ [^ ]+'; then
DPKGARCH="$(dpkg --print-architecture)"
@@ -851,7 +851,7 @@ testequalor2() {
echo "$2" > $COMPAREFILE2
shift 2
msgtest "Test for equality OR of" "$*"
$* 2>&1 1> $COMPAREAGAINST
$* >$COMPAREAGAINST 2>&1
(checkdiff $COMPAREFILE1 $COMPAREAGAINST 1> /dev/null ||
checkdiff $COMPAREFILE2 $COMPAREAGAINST 1> /dev/null) && msgpass ||
( echo "\n${CINFO}Diff against OR 1${CNORMAL}" "$(checkdiff $COMPAREFILE1 $COMPAREAGAINST)" \


+ 1
- 1
test/integration/skip-avoid-avoiding-breaks-predepends View File

@@ -17,5 +17,5 @@ Pre-Depends: looping (>= 1.15)'

setupaptarchive

aptget dist-upgrade -y -o Debug::pkgOrderList=1 #-qq 2>&1 > /dev/null
aptget dist-upgrade -y -o Debug::pkgOrderList=1 #-qq >/dev/null 2>&1
testdpkginstalled looping loop1 loop2

+ 2
- 2
test/integration/test-bug-612099-multiarch-conflicts View File

@@ -78,7 +78,7 @@ Conf libc6 (2.0 testing [all])' aptget upgrade -t testing -s
# FIXME: on amd64 systems this test wouldn't run with a real upgrade
# as APT (here i386) disagree about the native architecture, so
# we fake it here:
#aptget upgrade -y -qq 2>&1 > /dev/null
#aptget upgrade -y -qq >/dev/null 2>&1
testsuccess aptget purge libc6 -y
testsuccess aptget install libc6:i386 -y
testdpkginstalled libc6:all
@@ -176,7 +176,7 @@ Conf libc6-same (2.0 testing [all])' aptget upgrade -t testing -s
# FIXME: on amd64 systems this test wouldn't run with a real upgrade
# as APT (here i386) disagree about the native architecture, so
# we fake it here:
#aptget upgrade -y -qq 2>&1 > /dev/null
#aptget upgrade -y -qq >/dev/null 2>&1
testsuccess aptget purge libc6-same -y
testsuccess aptget install libc6-same:i386 -y
testdpkginstalled libc6-same:all


+ 1
- 1
test/integration/test-bug-618288-multiarch-same-lockstep View File

@@ -16,7 +16,7 @@ buildsimplenativepackage 'apt' 'i386' '2' 'unstable' 'Depends: libsame (= 2)' ''
buildsimplenativepackage 'apt2' 'amd64' '2' 'unstable' 'Depends: libsame (= 2)' '' 'required'

setupaptarchive
aptget dist-upgrade -s 2>&1 > output.apt
aptget dist-upgrade -s >output.apt 2>&1

# order in switch libsame:{amd64,i386} are unpacked is irrelevant, as both are installed - but we need to do it together
LS_U_AMD="$(grep -o -n '^Inst libsame ' output.apt | cut -d: -f1)"


Loading…
Cancel
Save