pass --force-remove-essential to dpkg only if needed

[apt.git] / test / integration / test-00-commands-have-help

diff --git a/test/integration/test-00-commands-have-help b/test/integration/test-00-commands-have-help
index bbd1475eb830285e60a450b2f458af42a7bfa924..699cdef150aa714b47f6a8b0f9bec5306c938e59 100755 (executable)
--- a/test/integration/test-00-commands-have-help
+++ b/test/integration/test-00-commands-have-help
@@ -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'
 
 setupenvironment
 configarchitecture 'amd64'


@@ -11,9 +11,11 @@ configarchitecture 'amd64'
 # but it also checks if the binary can find all methods in the library.
 # The later is quite handy for manual testing of non-abibreaking changes
 export LD_BIND_NOW=1
 # but it also checks if the binary can find all methods in the library.
 # The later is quite handy for manual testing of non-abibreaking changes
 export LD_BIND_NOW=1

+# german variant of klingon used for testing usage of non-existent l10n
+export LC_ALL=tlh_DE.UTF-8

 
 checkversionmessage() {
 
 checkversionmessage() {

-       testsuccess grep '^apt .* compiled on ' ${1}-help.output
+       testsuccess grep '^apt .* (' ${1}-help.output

 }
 
 checkhelpmessage() {
 }
 
 checkhelpmessage() {


@@ -47,7 +49,7 @@ for CMD in 'apt-cache' 'apt-cdrom' 'apt-config' \
        checkoptions "$cmd"
 done
 
        checkoptions "$cmd"
 done
 

-for CMD in 'apt-dump-solver'  'apt-internal-solver'; do
+for CMD in 'apt-dump-solver'  'apt-internal-solver' 'apt-internal-planner'; do

        checkoptions "$(echo "$CMD" | tr -d '-')"
 done
 
        checkoptions "$(echo "$CMD" | tr -d '-')"
 done