[test suite] better fwknopd is running check

This commit is contained in:
Michael Rash 2012-07-18 22:32:16 -04:00
parent 8ed741dd48
commit 72aaeb893e

View File

@ -2723,10 +2723,10 @@ sub is_fwknopd_running() {
&run_cmd("LD_LIBRARY_PATH=$lib_dir $fwknopdCmd $default_server_conf_args " . &run_cmd("LD_LIBRARY_PATH=$lib_dir $fwknopdCmd $default_server_conf_args " .
"--status", $cmd_out_tmp, $current_test_file); "--status", $cmd_out_tmp, $current_test_file);
return 0 if &file_find_regex([qr/no\s+running/i], return 1 if &file_find_regex([qr/Detected\sfwknopd\sis\srunning/i],
$MATCH_ALL, $cmd_out_tmp); $MATCH_ALL, $cmd_out_tmp);
return 1; return 0;
} }
sub stop_fwknopd() { sub stop_fwknopd() {