Merge branch 'debian/sid' into debian/experimental

[apt.git] / test / integration / test-bug-605394-versioned-or-groups

diff --git a/test/integration/test-bug-605394-versioned-or-groups b/test/integration/test-bug-605394-versioned-or-groups
index 0d7ad77f6b52997c16360d78a55b4fcda9681f2b..bb72d59e329c3f193644bbece223ed728a05a72c 100755 (executable)
--- a/test/integration/test-bug-605394-versioned-or-groups
+++ b/test/integration/test-bug-605394-versioned-or-groups
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

-local TESTDIR=$(readlink -f $(dirname $0))
+TESTDIR=$(readlink -f $(dirname $0))

 . $TESTDIR/framework
 setupenvironment
 configarchitecture "i386"
 . $TESTDIR/framework
 setupenvironment
 configarchitecture "i386"


@@ -9,6 +9,7 @@ setupaptarchive
 
 testequal "Reading package lists...
 Building dependency tree...
 
 testequal "Reading package lists...
 Building dependency tree...

+Calculating upgrade...

 The following packages will be upgraded:
   php5 php5-cgi
 2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 The following packages will be upgraded:
   php5 php5-cgi
 2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.