Merge branch 'refs/heads/t/wma'

[paraslash.git] / t / t0004-server.sh

diff --git a/t/t0004-server.sh b/t/t0004-server.sh
index 3cb37d4260cf21fb3ec83109642642cf67bc1f52..6a8e5bf1d77522658674a27e5370df26527f5c11 100755 (executable)
--- a/t/t0004-server.sh
+++ b/t/t0004-server.sh
@@ -28,7 +28,7 @@ declare -a commands=() cmdline=() required_objects=() good=() bad=()
 i=0
 commands[$i]="help"
 cmdline[$i]="help"
-good[$i]='help server  ----'
+good[$i]='help ----'
 
 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++
@@ -108,6 +108,7 @@ EOF
                --user-list "$user_list" \
                --http-port "$stream_port" \
                --dccp-port "$stream_port"
+       (($? != 0)) && exit 1
 fi
 
 for ((i=0; i < ${#commands[@]}; i++)); do