Merge pull request #280 from pinotree/init-fix

FROGGS · web-flow · commit 0f2af3b0639b · 2018-05-19T13:09:42.000+02:00
TestTool::init: properly handle SDL::init errors
diff --git a/t/lib/SDL/TestTool.pm b/t/lib/SDL/TestTool.pm
@@ -20,6 +20,7 @@ sub init {
 	my ( $self, $init ) = @_;
 	my $stdout = '';
 	my $stderr = '';
+	my $result = 0;
 
 	if ( $init == SDL_INIT_VIDEO ) {
 		if ( $^O !~ /win/i && !$ENV{DISPLAY} && !$ENV{SDL_VIDEODRIVER} ) {
@@ -36,12 +37,12 @@ sub init {
 		SDL::quit();
 	}
 
-	($stdout, $stderr ) = capture { SDL::init($init) };
-	if ( $stderr ne '' ) {
+	($stdout, $stderr, $result ) = capture { SDL::init($init) };
+	if ( $result != 0 ) {
 		warn 'Init ' . $inits{$init} . ' failed with SDL error: ' . SDL::get_error() . "\nand stderr $stderr\n";
 	}
 
-	return !( $stderr ne '' );
+	return $result == 0;
 }
 
 sub test_audio_open {

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ sub init {`
`20`	`20`	`my ( $self, $init ) = @_;`
`21`	`21`	`my $stdout = '';`
`22`	`22`	`my $stderr = '';`
	`23`	`+ my $result = 0;`
`23`	`24`
`24`	`25`	`if ( $init == SDL_INIT_VIDEO ) {`
`25`	`26`	`if ( $^O !~ /win/i && !$ENV{DISPLAY} && !$ENV{SDL_VIDEODRIVER} ) {`
`@@ -36,12 +37,12 @@ sub init {`
`36`	`37`	`SDL::quit();`
`37`	`38`	`}`
`38`	`39`
`39`		`- ($stdout, $stderr ) = capture { SDL::init($init) };`
`40`		`- if ( $stderr ne '' ) {`
	`40`	`+ ($stdout, $stderr, $result ) = capture { SDL::init($init) };`
	`41`	`+ if ( $result != 0 ) {`
`41`	`42`	`warn 'Init ' . $inits{$init} . ' failed with SDL error: ' . SDL::get_error() . "\nand stderr $stderr\n";`
`42`	`43`	`}`
`43`	`44`
`44`		`- return !( $stderr ne '' );`
	`45`	`+ return $result == 0;`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`sub test_audio_open {`