Deal with commands not even starting.
authorJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 21:52:06 +0000 (23:52 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 21:52:06 +0000 (23:52 +0200)
(This used to be commit 0f789e6779eca38d93b968a0ffbbb8559ce483f1)

source4/selftest/selftest.pl

index 39a1b5a45089be203d4da12aa4dd4730f3a0b6b6..53bfcb12f2df7f7e79b514dc52e18b08e5e2ef7c 100755 (executable)
@@ -238,7 +238,13 @@ sub run_testsuite($$$$$$)
 
        $msg_ops->start_test([], $name);
 
-       open(RESULT, "$cmd 2>&1|");
+       unless (open(RESULT, "$cmd 2>&1|")) {
+               $msg_ops->end_test([], $name, "error", 1, "Unable to run $cmd: $!");
+               $statistics->{SUITES_FAIL}++;
+               $statistics->{TESTS_ERROR}++;
+               return 0;
+       }
+
        my $expected_ret = parse_results(
                $msg_ops, $statistics, *RESULT, \&expecting_failure, [$name]);
 
@@ -251,16 +257,14 @@ sub run_testsuite($$$$$$)
        $ret = 0 unless $ret == 1;
 
        if ($ret == 1) {
-               $msg_ops->end_test([], $name, "success", $expected_ret != $ret, undef);
+               $msg_ops->end_test([], $name, "success", $expected_ret != $ret, undef); 
        } else {
-               $msg_ops->end_test([], $name, "failure", $expected_ret != $ret, 
-                                              "Returned $ret");
+               $msg_ops->end_test([], $name, "failure", $expected_ret != $ret, "Returned $ret");
        }
 
        cleanup_pcap($pcap_file, $expected_ret, $ret);
 
-       if (not $opt_socket_wrapper_keep_pcap and 
-               defined($pcap_file)) {
+       if (not $opt_socket_wrapper_keep_pcap and defined($pcap_file)) {
                $msg_ops->output_msg("PCAP FILE: $pcap_file\n");
        }