CMake: Switch integration tests and travis over

[apt.git] / test / integration / test-implicit-conflicts-real-not-virtual

diff --git a/test/integration/test-implicit-conflicts-real-not-virtual b/test/integration/test-implicit-conflicts-real-not-virtual
index c9fca4edfab1035387085fbf25eadb67f913dc97..02bd44208a4bb92603da112e1ca18c3b245a9c7d 100755 (executable)
--- a/test/integration/test-implicit-conflicts-real-not-virtual
+++ b/test/integration/test-implicit-conflicts-real-not-virtual
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 setupenvironment
 configarchitecture 'amd64' 'i386'
 
 setupenvironment
 configarchitecture 'amd64' 'i386'
 


@@ -17,7 +17,7 @@ insertinstalledpackage 'wireless-crda' 'amd64' '1.14'
 
 setupaptarchive
 
 
 setupaptarchive
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   crda
 Building dependency tree...
 The following NEW packages will be installed:
   crda


@@ -25,7 +25,7 @@ The following NEW packages will be installed:
 Inst crda (1.1.1-1ubuntu4m unstable-m [amd64])
 Conf crda (1.1.1-1ubuntu4m unstable-m [amd64])' aptget install crda -s -t unstable-m
 
 Inst crda (1.1.1-1ubuntu4m unstable-m [amd64])
 Conf crda (1.1.1-1ubuntu4m unstable-m [amd64])' aptget install crda -s -t unstable-m
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   crda
 Building dependency tree...
 The following NEW packages will be installed:
   crda


@@ -33,7 +33,7 @@ The following NEW packages will be installed:
 Inst crda (1.1.1-1ubuntu4p unstable-p [amd64])
 Conf crda (1.1.1-1ubuntu4p unstable-p [amd64])' aptget install crda -s -t unstable-p
 
 Inst crda (1.1.1-1ubuntu4p unstable-p [amd64])
 Conf crda (1.1.1-1ubuntu4p unstable-p [amd64])' aptget install crda -s -t unstable-p
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   crda
 Building dependency tree...
 The following NEW packages will be installed:
   crda


@@ -47,7 +47,7 @@ Conflicts: wireless-crda (<< 1.15)
 Replaces: wireless-crda ( << 1.15)
 Multi-arch: foreign'
 
 Replaces: wireless-crda ( << 1.15)
 Multi-arch: foreign'
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   wireless-crda
 Building dependency tree...
 The following NEW packages will be installed:
   wireless-crda