commit afc2ddab0866deb13701b07445486225527552d2
parent b780485691980822639602837cde41e59b61bd89
Author: Kyle Milz <kyle@0x30.net>
Date: Sun, 14 Aug 2016 14:52:39 -0600
t: update expected outputs after recent changes
Diffstat:
21 files changed, 91 insertions(+), 99 deletions(-)
diff --git a/src/check.in b/src/check.in
@@ -15,8 +15,8 @@ fi
[ -d $dir ] || err "citrun-check: $dir: no such directory"
GREP[0]="Tool called as "
-GREP[1]="Link detected"
-GREP[2]="Found source file"
+GREP[1]="Found source file"
+GREP[2]="Link detected"
GREP[3]="warning: "
GREP[4]="error: "
GREP[5]="Rewriting successful"
@@ -27,8 +27,8 @@ GREP[9]="And the unrewritten source compile failed"
GREP[10]="But the unrewritten source compile succeeded"
DESC[0]="Calls to the rewrite tool"
-DESC[1]="Application link commands"
-DESC[2]="Source files used as input"
+DESC[1]="Source files used as input"
+DESC[2]="Application link commands"
DESC[3]="Rewrite parse warnings"
DESC[4]="Rewrite parse errors"
DESC[5]="Rewrite successes"
diff --git a/t/inst_binop.t b/t/inst_binop.t
@@ -48,9 +48,9 @@ EOF
cat <<EOF > check.good
Summary:
1 Log files found
- 1 Source files input
- 1 Calls to the instrumentation tool
- 1 Instrument successes
+ 1 Calls to the rewrite tool
+ 1 Source files used as input
+ 1 Rewrite successes
Totals:
18 Lines of source code
diff --git a/t/inst_correct.t b/t/inst_correct.t
@@ -31,11 +31,11 @@ EOF
cat <<EOF > check.good
Summary:
1 Log files found
- 1 Source files input
- 1 Calls to the instrumentation tool
- 1 Forked compilers
- 1 Instrument successes
+ 1 Calls to the rewrite tool
+ 1 Source files used as input
1 Application link commands
+ 1 Rewrite successes
+ 1 Rewritten source compile successes
Totals:
21 Lines of source code
diff --git a/t/inst_dowhile.t b/t/inst_dowhile.t
@@ -26,9 +26,9 @@ EOF
cat <<EOF > check.good
Summary:
1 Log files found
- 1 Source files input
- 1 Calls to the instrumentation tool
- 1 Instrument successes
+ 1 Calls to the rewrite tool
+ 1 Source files used as input
+ 1 Rewrite successes
Totals:
7 Lines of source code
diff --git a/t/inst_for.t b/t/inst_for.t
@@ -26,9 +26,9 @@ EOF
cat <<EOF > check.good
Summary:
1 Log files found
- 1 Source files input
- 1 Calls to the instrumentation tool
- 1 Instrument successes
+ 1 Calls to the rewrite tool
+ 1 Source files used as input
+ 1 Rewrite successes
Totals:
7 Lines of source code
diff --git a/t/inst_funcdef.t b/t/inst_funcdef.t
@@ -30,9 +30,9 @@ EOF
cat <<EOF > check.good
Summary:
1 Log files found
- 1 Source files input
- 1 Calls to the instrumentation tool
- 1 Instrument successes
+ 1 Calls to the rewrite tool
+ 1 Source files used as input
+ 1 Rewrite successes
Totals:
9 Lines of source code
diff --git a/t/inst_if.t b/t/inst_if.t
@@ -36,9 +36,9 @@ EOF
cat <<EOF > check.good
Summary:
1 Log files found
- 1 Source files input
- 1 Calls to the instrumentation tool
- 1 Instrument successes
+ 1 Calls to the rewrite tool
+ 1 Source files used as input
+ 1 Rewrite successes
Totals:
12 Lines of source code
diff --git a/t/inst_link_multiple.t b/t/inst_link_multiple.t
@@ -39,11 +39,11 @@ $TEST_TOOLS/citrun-check > check.out && echo ok
cat <<EOF > check.good
Summary:
1 Log files found
- 3 Source files input
- 4 Calls to the instrumentation tool
- 3 Forked compilers
- 3 Instrument successes
+ 4 Calls to the rewrite tool
+ 3 Source files used as input
1 Application link commands
+ 3 Rewrite successes
+ 3 Rewritten source compile successes
Totals:
18 Lines of source code
diff --git a/t/inst_log.t b/t/inst_log.t
@@ -63,10 +63,10 @@ Instrumentation of '' finished:
58 Total statements
6 Binary operators
Modified source written successfully.
-Instrumentation successful.
-Running native compiler on modified source code.
+Rewriting successful.
Forked ''.
'' exited 0.
+Rewritten source compile successful.
Restored ''.
citrun-inst 0.0 ()
Tool called as ''.
diff --git a/t/inst_macro.t b/t/inst_macro.t
@@ -27,9 +27,9 @@ EOF
cat <<EOF > check.good
Summary:
1 Log files found
- 1 Source files input
- 1 Calls to the instrumentation tool
- 1 Instrument successes
+ 1 Calls to the rewrite tool
+ 1 Source files used as input
+ 1 Rewrite successes
Totals:
7 Lines of source code
diff --git a/t/inst_return.t b/t/inst_return.t
@@ -36,9 +36,9 @@ EOF
cat <<EOF > check.good
Summary:
1 Log files found
- 1 Source files input
- 1 Calls to the instrumentation tool
- 1 Instrument successes
+ 1 Calls to the rewrite tool
+ 1 Source files used as input
+ 1 Rewrite successes
Totals:
12 Lines of source code
diff --git a/t/inst_src_ext.t b/t/inst_src_ext.t
@@ -16,10 +16,10 @@ $TEST_TOOLS/citrun-wrap cc -c main.C
cat <<EOF > check.good
Summary:
1 Log files found
- 4 Source files input
- 5 Calls to the instrumentation tool
- 4 Forked compilers
- 4 Instrument successes
+ 5 Calls to the rewrite tool
+ 4 Source files used as input
+ 4 Rewrite successes
+ 4 Rewritten source compile successes
Totals:
4 Lines of source code
diff --git a/t/inst_stdout.t b/t/inst_stdout.t
@@ -17,11 +17,11 @@ EOF
cat <<EOF > check.good
Summary:
1 Log files found
- 1 Source files input
- 1 Calls to the instrumentation tool
- 1 Forked compilers
- 1 Instrument successes
+ 1 Calls to the rewrite tool
+ 1 Source files used as input
1 Application link commands
+ 1 Rewrite successes
+ 1 Rewritten source compile successes
Totals:
7 Lines of source code
diff --git a/t/inst_switch.t b/t/inst_switch.t
@@ -38,9 +38,9 @@ EOF
cat <<EOF > check.good
Summary:
1 Log files found
- 1 Source files input
- 1 Calls to the instrumentation tool
- 1 Instrument successes
+ 1 Calls to the rewrite tool
+ 1 Source files used as input
+ 1 Rewrite successes
Totals:
13 Lines of source code
diff --git a/t/inst_two_src.t b/t/inst_two_src.t
@@ -21,11 +21,11 @@ EOF
cat <<EOF > check.good
Summary:
1 Log files found
- 2 Source files input
- 1 Calls to the instrumentation tool
- 1 Forked compilers
- 1 Instrument successes
+ 1 Calls to the rewrite tool
+ 2 Source files used as input
1 Application link commands
+ 1 Rewrite successes
+ 1 Rewritten source compile successes
Totals:
8 Lines of source code
diff --git a/t/inst_while.t b/t/inst_while.t
@@ -28,9 +28,9 @@ EOF
cat <<EOF > check.good
Summary:
1 Log files found
- 1 Source files input
- 1 Calls to the instrumentation tool
- 1 Instrument successes
+ 1 Calls to the rewrite tool
+ 1 Source files used as input
+ 1 Rewrite successes
Totals:
8 Lines of source code
diff --git a/tt/ccitrunrun.t b/tt/ccitrunrun.t
@@ -63,29 +63,27 @@ $exp->hard_close();
open( my $fh, ">", "check.good" );
print $fh <<EOF;
-Checking ..done
-
Summary:
1 Log files found
- 23 Source files input
- 26 Calls to the instrumentation tool
- 23 Forked compilers
- 23 Instrument successes
+ 28 Calls to the rewrite tool
+ 25 Source files used as input
3 Application link commands
- 10 Warnings during source parsing
+ 15 Rewrite parse warnings
+ 25 Rewrite successes
+ 25 Rewritten source compile successes
Totals:
- 5350 Lines of source code
+ 5481 Lines of source code
3 Functions called 'main'
- 222 Function definitions
- 205 If statements
+ 238 Function definitions
+ 207 If statements
27 For loops
12 While loops
3 Switch statements
- 89 Return statement values
- 1097 Call expressions
- 16820 Total statements
- 1559 Binary operators
+ 106 Return statement values
+ 1043 Call expressions
+ 16602 Total statements
+ 1563 Binary operators
6 Errors rewriting source
EOF
diff --git a/tt/git.t b/tt/git.t
@@ -290,18 +290,17 @@ $viewer->close();
open( my $fh, ">", "check.good" );
print $fh <<EOF;
-Checking ..done
-
Summary:
1 Log files found
- 381 Source files input
- 448 Calls to the instrumentation tool
- 381 Forked compilers
- 376 Instrument successes
- 5 Both instrument and native compile failed (FP)
+ 448 Calls to the rewrite tool
+ 381 Source files used as input
82 Application link commands
- 45 Warnings during source parsing
- 5 Errors during source parsing
+ 45 Rewrite parse warnings
+ 5 Rewrite parse errors
+ 376 Rewrite successes
+ 5 Rewrite failures (False Positive)
+ 374 Rewritten source compile successes
+ 2 Rewritten source compile failues (False Positive)
Totals:
185689 Lines of source code
diff --git a/tt/mutt.t b/tt/mutt.t
@@ -121,18 +121,17 @@ $exp->hard_close();
open( my $fh, ">", "check.good" );
print $fh <<EOF;
-Checking ....done
-
Summary:
3 Log files found
- 218 Source files input
- 262 Calls to the instrumentation tool
- 218 Forked compilers
- 209 Instrument successes
- 9 Both instrument and native compile failed (FP)
+ 262 Calls to the rewrite tool
+ 218 Source files used as input
73 Application link commands
- 339 Warnings during source parsing
- 10 Errors during source parsing
+ 339 Rewrite parse warnings
+ 10 Rewrite parse errors
+ 209 Rewrite successes
+ 9 Rewrite failures (False Positive)
+ 194 Rewritten source compile successes
+ 15 Rewritten source compile failues (False Positive)
Totals:
94664 Lines of source code
diff --git a/tt/nvi.t b/tt/nvi.t
@@ -135,16 +135,14 @@ $viewer->close();
open( my $fh, ">", "check.good" );
print $fh <<EOF;
-Checking ...done
-
Summary:
2 Log files found
- 115 Source files input
- 116 Calls to the instrumentation tool
- 115 Forked compilers
- 115 Instrument successes
+ 116 Calls to the rewrite tool
+ 115 Source files used as input
2 Application link commands
- 32 Warnings during source parsing
+ 32 Rewrite parse warnings
+ 115 Rewrite successes
+ 115 Rewritten source compile successes
Totals:
47830 Lines of source code
diff --git a/tt/openssl.t b/tt/openssl.t
@@ -705,16 +705,14 @@ $viewer->close();
open( my $fh, ">", "check.good" );
print $fh <<EOF;
-Checking ...........................................................done
-
Summary:
58 Log files found
- 752 Source files input
- 868 Calls to the instrumentation tool
- 752 Forked compilers
- 752 Instrument successes
+ 868 Calls to the rewrite tool
+ 752 Source files used as input
58 Application link commands
- 752 Warnings during source parsing
+ 752 Rewrite parse warnings
+ 752 Rewrite successes
+ 752 Rewritten source compile successes
Totals:
322027 Lines of source code