Merge remote-tracking branch 'original/master'

3 files changed, 10 insertions, 12 deletions

diff --git a/test/feh-i.t b/test/feh-i.t
index ff247a2..24775e3 100755
--- a/test/feh-i.t
+++ b/test/feh-i.t
@@ -138,28 +138,28 @@ SendKeys('{RIG}');
 test_win_title( $win, 'feh slideshow 2/3 jpg' );
 feh_stop();
 
-feh_start( '--cycle-once', 'test/ok/png test/ok/jpg' );
+feh_start( '--on-last-slide=quit', 'test/ok/png test/ok/jpg' );
 for ( 1 .. 2 ) {
 	SendKeys('{RIG}');
 }
-test_no_win("--cycle-once -> window closed");
+test_no_win("--on-last-slide=quit -> window closed");
 
 feh_start(
-	'--cycle-once --slideshow-delay 0.5',
+	'--on-last-slide=quit --slideshow-delay 0.5',
 	'test/ok/png test/ok/jpg test/ok/gif'
 );
 sleep(1.5);
-test_no_win('cycle-once + slideshow-delay -> window closed');
+test_no_win('on-last-slide=quit + slideshow-delay -> window closed');
 
 $win = feh_start(
-	'--cycle-once --slideshow-delay -0.01',
+	'--on-last-slide=quit --slideshow-delay -0.01',
 	'test/ok/png test/ok/jpg test/ok/gif'
 );
 
 test_win_title( $win, 'feh [1 of 3] - test/ok/png [Paused]' );
 
 SendKeys('h');
-test_no_win('cycle-once + negative delay + [h]');
+test_no_win('on-last-slide=quit + negative delay + [h]');
 
 $win = feh_start( q{}, 'test/ok/png test/ok/gif test/ok/gif test/ok/jpg' );
 for ( 1 .. 2 ) {
diff --git a/test/mandoc.t b/test/mandoc.t
index 638c5e9..9e7ffc3 100755
--- a/test/mandoc.t
+++ b/test/mandoc.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use 5.010;
 
-use Test::More tests => 3;
+use Test::More tests => 1;
 
 SKIP: {
 	my $mandoc_present = 0;
@@ -17,10 +17,10 @@ SKIP: {
 
 	if ( not $mandoc_present ) {
 		diag('mandoc not installed, test skipped. This is NOT fatal.');
-		skip( 'mandoc not installed', 3 );
+		skip( 'mandoc not installed', 1 );
 	}
 
-	for my $file ( 'feh', 'feh-cam', 'gen-cam-menu' ) {
+	for my $file ('feh') {
 		qx{mandoc -Tlint -Werror man/${file}.1};
 		is( $?, 0, "${file}.1: Valid mdoc syntax" );
 	}
diff --git a/test/status b/test/status
index 2cda6d8..6db362e 100644
--- a/test/status
+++ b/test/status
@@ -76,15 +76,13 @@ Overall test status, what's covered / missing
  [x] correct caption display
 
 
---collage
-
 --customlist
 
  [x] correct output
  [x] format specifiers
 
 
---cycle-once
+--on-last-slide=quit
 
  [x] closes feh window at end of slideshow
  [x] combination with --slideshow-delay