citrun

commit 8311318c61dd4370f2a6192707404d85e08724e6
parent 3b874c6a270f53a5f417291325fccb9ae873b423
Author: Kyle Milz <kyle@windows.krwm.net>
Date:   Thu,  5 Jan 2017 19:55:59 -0800

t: fill out more tests now that instrumented programs run

Diffstat:
M
t/wrap_jam.t
 | 
14
++++----------
M
t/wrap_nmake.t
 | 
14
+++++---------

2 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/t/wrap_jam.t b/t/wrap_jam.t
@@ -20,6 +20,7 @@ Main program : main.c ;
 EOF
 
 $wrap->run( args => 'jam', chdir => $wrap->curdir );
+print $wrap->stdout;
 is( $wrap->stderr,	'',	'is citrun_wrap jam stderr silent' );
 is( $? >> 8,		0,	'is citrun_wrap jam exit code 0' );
 
@@ -56,13 +57,6 @@ $citrun_log = clean_citrun_log( $citrun_log );
 eq_or_diff( $citrun_log, $log_good,	'is citrun_wrap log file identical', { context => 3 } );
 
 $wrap->run( prog => $wrap->workdir . '/program', chdir => $wrap->curdir );
-
-SKIP: {
-	skip 'win32 broken', 3 if $^O eq "MSWin32";
-
-	is( $wrap->stdout,	'',	'is instrumented program stdout silent' );
-	is( $wrap->stderr,	'',	'is instrumented program stderr silent' );
-	is( $? >> 8,		0,	'is instrumented program exit code 0' );
-}
-
-#ok "is runtime shared memory file created" test -f procdir/program_*
+is( $wrap->stdout,	'',	'is instrumented program stdout silent' );
+is( $wrap->stderr,	'',	'is instrumented program stderr silent' );
+is( $? >> 8,		0,	'is instrumented program exit code 0' );
diff --git a/t/wrap_nmake.t b/t/wrap_nmake.t
@@ -2,11 +2,8 @@ use strict;
 use warnings;
 use t::utils;
 
-if ($^O eq "MSWin32") {
-	plan tests => 4;
-} else {
-	plan skip_all => 'win32 only';
-}
+plan skip_all => 'win32 only' if ($^O ne "MSWin32");
+plan tests => 6;
 
 my $wrap = Test::Cmd->new( prog => 'citrun_wrap', workdir => '' );
 
@@ -18,7 +15,6 @@ main.exe: main.obj
 EOF
 
 $wrap->run( args => 'nmake /nologo', chdir => $wrap->curdir );
-
 print $wrap->stdout;
 is( $wrap->stderr, '',	'is citrun_wrap nmake stderr silent' );
 is( $? >> 8,	0,	'is citrun_wrap nmake exit code 0' );
@@ -67,6 +63,6 @@ eq_or_diff( $citrun_log,	$log_good,	'is nmake citrun.log identical',
 	{ context => 3 } );
 
 $wrap->run( prog => $wrap->workdir . "/main", chdir => $wrap->curdir );
-print $wrap->stdout;
-print $wrap->stderr;
-is( $? >> 8,	1,	'is main exit code 1' );
+is( $wrap->stdout,	'',	'is instrumented program stdout silent' );
+is( $wrap->stderr,	'',	'is instrumented program stderr silent' );
+is( $? >> 8,		0,	'is main exit code 1' );