X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=t%2Ft0004-server.sh;h=03957464e17e2a50596149e59627cd7584424fe9;hp=c2e809cb6da569d05177bd3552ece039047a96e7;hb=a3f1f4be0b949114a018971d3e954c9e1b7b9744;hpb=f80453b693e6d3ce5450755310faf5e5d6e5c143

diff --git a/t/t0004-server.sh b/t/t0004-server.sh
index c2e809cb..03957464 100755
--- a/t/t0004-server.sh
+++ b/t/t0004-server.sh
@@ -27,8 +27,8 @@ declare -a oggs_base=(${oggs[@]##*/})
 declare -a commands=() cmdline=() required_objects=() good=() bad=()
 i=0
 commands[$i]="help"
-cmdline[$i]="help"
-good[$i]='help	server	----'
+cmdline[$i]="help -l"
+good[$i]='help \{1,\}----'
 
 let i++
 commands[$i]="init"
@@ -45,7 +45,7 @@ bad[$i]='.'
 let i++
 commands[$i]="ls_ogg"
 required_objects[$i]='ogg_afh'
-cmdline[$i]="ls -l=v ${oggs_base[@]}"
+cmdline[$i]="ls -l=v -b ${oggs_base[@]}"
 good[$i]='^basename:'
 
 let i++
@@ -69,7 +69,7 @@ bad[$i]='.'
 let i++
 commands[$i]="ls"
 required_objects[$i]='ogg_afh'
-cmdline[$i]="ls -l=v -p ${oggs[@]}"
+cmdline[$i]="ls -l=v ${oggs[@]}"
 good[$i]='^attributes_txt: 33'
 
 let i++
@@ -83,7 +83,7 @@ test_require_executables "ssh-keygen"
 missing_executables="$result"
 
 if [[ -z "$missing_objects" && -z "$missing_executables" ]]; then
-	ssh-keygen -q -t rsa -b 2048 -N "" -f $privkey
+	ssh-keygen -q -t rsa -b 2048 -N "" -m PEM -f $privkey
 	key_gen_result=$?
 
 	read &>/dev/null < /dev/tcp/localhost/$port