Merge branch 'master' of github.com:derf/feh

1 files changed, 10 insertions, 3 deletions

diff --git a/test/mandoc.t b/test/mandoc.t
index 3740809..638c5e9 100755
--- a/test/mandoc.t
+++ b/test/mandoc.t
@@ -6,15 +6,22 @@ use 5.010;
 use Test::More tests => 3;
 
 SKIP: {
-	qx{mandoc -V};
+	my $mandoc_present = 0;
 
-	if ( $? != 0 ) {
+	for my $path (split(qr{:}, $ENV{PATH})) {
+		if (-x "${path}/mandoc") {
+			$mandoc_present = 1;
+			last;
+		}
+	}
+
+	if ( not $mandoc_present ) {
 		diag('mandoc not installed, test skipped. This is NOT fatal.');
 		skip( 'mandoc not installed', 3 );
 	}
 
 	for my $file ( 'feh', 'feh-cam', 'gen-cam-menu' ) {
-		qx{mandoc -Tlint man/${file}.1};
+		qx{mandoc -Tlint -Werror man/${file}.1};
 		is( $?, 0, "${file}.1: Valid mdoc syntax" );
 	}
 }