citrun

commit dd6cd1d7a9dc19b3fb422a56ab1a6250772634ff
parent fe5a95ff877f1470536063a8a692510a1353abd5
Author: Kyle Milz <kyle@windows.krwm.net>
Date:   Mon,  2 Jan 2017 14:44:57 -0800

t: fix up inst_preprocess

Diffstat:
M
t/inst_preprocess.t
 | 
14
++++++++------

1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/t/inst_preprocess.t b/t/inst_preprocess.t
@@ -15,13 +15,15 @@ $inst->write( 'prepro.c', $preproc );
 
 # Test -E
 my $check_good = <<EOF ;
->> citrun_inst v0.0 ()
+>> citrun_inst
 CITRUN_SHARE = ''
 Preprocessor argument -E found
 Running as citrun_inst, not calling exec()
 EOF
 
 $inst->run( args => '-E prepro.c', chdir => $inst->curdir );
+system( "dir " . $inst->workdir );
+print STDERR $inst->stdout ;
 
 # This file should not have been modified.
 my $inst_out;
@@ -29,19 +31,19 @@ $inst->read(\$inst_out, 'prepro.c');
 
 # Sanitize paths from stdout.
 my $check_out = $inst->stdout;
+$check_out =~ s/>> citrun_inst.*\n/>> citrun_inst\n/gm;
 $check_out =~ s/^.*Milliseconds spent.*\n//gm;
 $check_out =~ s/'.*'/''/gm;
-$check_out =~ s/\(.*\)/\(\)/gm;
 $check_out =~ s/^[0-9]+: //gm;
 
 eq_or_diff( $inst_out,	$preproc, 'is instrumented file identical', { context => 3 } );
-eq_or_diff $check_good,	$check_out, 'is citrun_inst output identical';
+eq_or_diff $check_out,	$check_good, 'is citrun_inst output identical';
 is( $inst->stderr,	'',	'is citrun_inst stderr silent' );
 is( $? >> 8,		0,	'is citrun_inst exit code 0' );
 
 # Test -MM
 $check_good = <<EOF ;
->> citrun_inst v0.0 ()
+>> citrun_inst
 CITRUN_SHARE = ''
 Preprocessor argument -MM found
 Running as citrun_inst, not calling exec()
@@ -54,12 +56,12 @@ $inst->read(\$inst_out, 'prepro.c');
 
 # Sanitize paths from stdout.
 $check_out = $inst->stdout;
+$check_out =~ s/>> citrun_inst.*\n/>> citrun_inst\n/gm;
 $check_out =~ s/^.*Milliseconds spent.*\n//gm;
 $check_out =~ s/'.*'/''/gm;
-$check_out =~ s/\(.*\)/\(\)/gm;
 $check_out =~ s/^[0-9]+: //gm;
 
 eq_or_diff( $inst_out,	$preproc, 'is instrumented file identical', { context => 3 } );
-eq_or_diff $check_good,	$check_out, 'is citrun_inst output identical';
+eq_or_diff $check_out,	$check_good, 'is citrun_inst output identical', { context => 3 };
 is( $inst->stderr,	'',	'is citrun_inst stderr silent' );
 is( $? >> 8,		0,	'is citrun_inst exit code 0' );