X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=t%2Ft0004-server.sh;h=04d6cd609a33a9886130d31efff86f4af509ab6f;hp=c79ea24be07c3235a11d9518788dd7dac3c0d6f6;hb=1e97f6746b605e37826fb6ee2ad35b7b330145d6;hpb=3150a0caa27a34d44556fb77f4a5aebc3d978580

diff --git a/t/t0004-server.sh b/t/t0004-server.sh
index c79ea24b..04d6cd60 100755
--- a/t/t0004-server.sh
+++ b/t/t0004-server.sh
@@ -57,30 +57,33 @@ missing_objects="$result"
 test_require_executables "ssh-keygen"
 missing_executables="$result"
 
-ssh-keygen -q -t rsa -b 2048 -N "" -f $privkey
-key_gen_result=$?
+if [[ -z "$missing_objects" && -z "$missing_executables" ]]; then
+	ssh-keygen -q -t rsa -b 2048 -N "" -f $privkey
+	key_gen_result=$?
 
-read &>/dev/null < /dev/tcp/localhost/$port
-check_port_result=$?
+	read &>/dev/null < /dev/tcp/localhost/$port
+	check_port_result=$?
 
-cat > $user_list << EOF
-user $LOGNAME $pubkey AFS_READ,AFS_WRITE,VSS_READ,VSS_WRITE
+	cat > $user_list << EOF
+	user $LOGNAME $pubkey AFS_READ,AFS_WRITE,VSS_READ,VSS_WRITE
 EOF
 
-# para_server sends this signal to all processes in the current process group.
-trap "" SIGUSR1
-
-$PARA_SERVER \
-	--logfile "$serverlog" \
-	--config_file /dev/null \
-	--daemon \
-	--loglevel $loglevel \
-	--port $port \
-	--afs_database_dir "$db" \
-	--afs_socket "$sock" \
-	--user_list "$user_list" \
-	--http_port "$stream_port" \
-	--dccp_port "$stream_port"
+	# para_server sends this signal to all processes in the current process group.
+	trap "" SIGUSR1
+
+
+	$PARA_SERVER \
+		--logfile "$serverlog" \
+		--config-file /dev/null \
+		--daemon \
+		--loglevel $loglevel \
+		--port $port \
+		--afs-database-dir "$db" \
+		--afs-socket "$sock" \
+		--user-list "$user_list" \
+		--http-port "$stream_port" \
+		--dccp-port "$stream_port"
+fi
 
 for ((i=0; i < ${#commands[@]}; i++)); do
 	command=${commands[$i]}
@@ -111,9 +114,9 @@ for ((i=0; i < ${#commands[@]}; i++)); do
 	test_expect_success "$command" "
 	$PARA_CLIENT \
 		--loglevel $loglevel \
-		--server_port $port \
-		--key_file $privkey \
-		--config_file /dev/null \
+		--server-port $port \
+		--key-file $privkey \
+		--config-file /dev/null \
 		-- \
 		${cmdline[$i]} > $command.out &&
 		{ [[ -z \"${good[$i]}\" ]] || grep \"${good[$i]}\"; } < $command.out &&