commit 165584608fdc0e749f35e67cb7fde2294cd6a9e7
parent ab0ac8f6eae21ebb43eb069778636bf626ee443c
Author: Kyle Milz <kyle@0x30.net>
Date: Sun, 1 Jan 2017 12:42:43 -0700
t: update tests for last change
Diffstat:
10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/t/inst_binop.t b/t/inst_binop.t
@@ -54,7 +54,6 @@ EOF
my $check_good = <<EOF;
>> citrun_inst v0.0 ()
CITRUN_SHARE = ''
-Switching argv[0] ''
Found source file ''
Modified command line is ''
Added clangtool argument ''
@@ -81,6 +80,7 @@ my $check_out = $inst->stdout;
$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, $inst_good, 'is instrumented file identical', { context => 3 } );
eq_or_diff $check_good, $check_out, 'is citrun_inst output identical';
diff --git a/t/inst_dowhile.t b/t/inst_dowhile.t
@@ -32,7 +32,6 @@ EOF
my $check_good = <<EOF;
>> citrun_inst v0.0 ()
CITRUN_SHARE = ''
-Switching argv[0] ''
Found source file ''
Modified command line is ''
Added clangtool argument ''
@@ -59,6 +58,7 @@ my $check_out = $inst->stdout;
$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, $inst_good, 'is instrumented file identical', { context => 3 } );
eq_or_diff $check_good, $check_out, 'is citrun_inst output identical';
diff --git a/t/inst_for.t b/t/inst_for.t
@@ -32,7 +32,6 @@ EOF
my $check_good = <<EOF;
>> citrun_inst v0.0 ()
CITRUN_SHARE = ''
-Switching argv[0] ''
Found source file ''
Modified command line is ''
Added clangtool argument ''
@@ -58,6 +57,7 @@ my $check_out = $inst->stdout;
$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, $inst_good, 'is instrumented file identical', { context => 3 } );
eq_or_diff $check_good, $check_out, 'is citrun_inst output identical';
diff --git a/t/inst_funcdef.t b/t/inst_funcdef.t
@@ -36,7 +36,6 @@ EOF
my $check_good = <<EOF;
>> citrun_inst v0.0 ()
CITRUN_SHARE = ''
-Switching argv[0] ''
Found source file ''
Modified command line is ''
Added clangtool argument ''
@@ -60,6 +59,7 @@ my $check_out = $inst->stdout;
$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, $inst_good, 'is instrumented file identical', { context => 3 } );
eq_or_diff $check_good, $check_out, 'is citrun_inst output identical';
diff --git a/t/inst_if.t b/t/inst_if.t
@@ -42,7 +42,6 @@ EOF
my $check_good = <<EOF;
>> citrun_inst v0.0 ()
CITRUN_SHARE = ''
-Switching argv[0] ''
Found source file ''
Modified command line is ''
Added clangtool argument ''
@@ -69,6 +68,7 @@ my $check_out = $inst->stdout;
$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, $inst_good, 'is instrumented file identical', { context => 3 } );
eq_or_diff $check_good, $check_out, 'is citrun_inst output identical';
diff --git a/t/inst_macro.t b/t/inst_macro.t
@@ -33,7 +33,6 @@ EOF
my $check_good = <<EOF;
>> citrun_inst v0.0 ()
CITRUN_SHARE = ''
-Switching argv[0] ''
Found source file ''
Modified command line is ''
Added clangtool argument ''
@@ -58,6 +57,7 @@ my $check_out = $inst->stdout;
$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, $inst_good, 'is instrumented file identical', { context => 3 } );
eq_or_diff $check_good, $check_out, 'is citrun_inst output identical';
diff --git a/t/inst_preprocess.t b/t/inst_preprocess.t
@@ -17,7 +17,6 @@ $inst->write( 'prepro.c', $preproc );
my $check_good = <<EOF ;
>> citrun_inst v0.0 ()
CITRUN_SHARE = ''
-Switching argv[0] ''
Preprocessor argument -E found
Running as citrun_inst, not calling exec()
EOF
@@ -33,6 +32,7 @@ my $check_out = $inst->stdout;
$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';
@@ -43,7 +43,6 @@ is( $? >> 8, 0, 'is citrun_inst exit code 0' );
$check_good = <<EOF ;
>> citrun_inst v0.0 ()
CITRUN_SHARE = ''
-Switching argv[0] ''
Preprocessor argument -MM found
Running as citrun_inst, not calling exec()
EOF
@@ -58,6 +57,7 @@ $check_out = $inst->stdout;
$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';
diff --git a/t/inst_return.t b/t/inst_return.t
@@ -42,7 +42,6 @@ EOF
my $check_good = <<EOF;
>> citrun_inst v0.0 ()
CITRUN_SHARE = ''
-Switching argv[0] ''
Found source file ''
Modified command line is ''
Added clangtool argument ''
@@ -69,6 +68,7 @@ my $check_out = $inst->stdout;
$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, $inst_good, 'is instrumented file identical', { context => 3 } );
eq_or_diff $check_good, $check_out, 'is citrun_inst output identical';
diff --git a/t/inst_switch.t b/t/inst_switch.t
@@ -46,7 +46,6 @@ EOF
my $check_good = <<EOF;
>> citrun_inst v0.0 ()
CITRUN_SHARE = ''
-Switching argv[0] ''
Found source file ''
Modified command line is ''
Added clangtool argument ''
@@ -72,6 +71,7 @@ my $check_out = $inst->stdout;
$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, $inst_good, 'is instrumented file identical', { context => 3 } );
eq_or_diff $check_good, $check_out, 'is citrun_inst output identical';
diff --git a/t/inst_while.t b/t/inst_while.t
@@ -34,7 +34,6 @@ EOF
my $check_good = <<EOF;
>> citrun_inst v0.0 ()
CITRUN_SHARE = ''
-Switching argv[0] ''
Found source file ''
Modified command line is ''
Added clangtool argument ''
@@ -61,6 +60,7 @@ my $check_out = $inst->stdout;
$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, $inst_good, 'is instrumented file identical', { context => 3 } );
eq_or_diff $check_good, $check_out, 'is citrun_inst output identical';