citrun

commit e460a63c520bfa2c812a48ac158e38a229238cfa
parent 67d0a5d9a9014a500eb572c0ab21dbfcfa90f42b
Author: Kyle Milz <kyle@0x30.net>
Date:   Fri,  5 Aug 2016 13:20:35 -0600

t: move static runtime checking into rt_static

Diffstat:
M
t/rt_dynamic.t
 | 
8
+-------
M
t/rt_static.t
 | 
20
++++++++++----------

2 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/t/rt_dynamic.t b/t/rt_dynamic.t
@@ -1,6 +1,5 @@
 use strict;
-use Cwd;
-use Test::More tests => 56;
+use Test::More tests => 51;
 use Test::Project;
 use Test::Viewer;
 
@@ -57,11 +56,6 @@ $project->compile();
 $project->run(45);
 
 $viewer->accept();
-is( $viewer->{maj}, 0, "protocol major" );
-is( $viewer->{min}, 0, "protocol minor" );
-is( $viewer->{ntus}, 3, "translation unit count" );
-is( $viewer->{progname}, "program", "program name" );
-is( $viewer->{cwd}, getcwd, "current working dir" );
 
 # Check static data.
 my @known_good = [
diff --git a/t/rt_static.t b/t/rt_static.t
@@ -1,5 +1,6 @@
 use strict;
-use Test::More tests => 16;
+use Cwd;
+use Test::More tests => 19;
 use Test::Project;
 use Test::Viewer;
 
@@ -10,30 +11,29 @@ $project->add_src(<<EOF);
 int
 main(void)
 {
-	/* Just do something so we can probe the runtime reliably */
 	while (1);
 	return 0;
 }
 EOF
-
 $project->compile();
 $project->run();
 
 $viewer->accept();
-
-is( $viewer->{maj}, 	0,	"major version" );
-is( $viewer->{min}, 	0,	"minor version" );
-is( scalar @{ $viewer->{pids} },	3,	"number of pids" );
+is( $viewer->{maj}, 	0,	"protocol major version" );
+is( $viewer->{min}, 	0,	"protocol minor version" );
+is( $viewer->{ntus},	1,	"translation unit count" );
+is( $viewer->{nlines},	7,	"total program lines" );
+is( $viewer->{progname}, "program", "program name" );
+is( $viewer->{cwd},	getcwd,	"current working dir" );
+is( @{ $viewer->{pids} },	3,	"number of pids" );
 cmp_ok( $viewer->{pids}->[0],	">",	1,	"pid check lower" );
 cmp_ok( $viewer->{pids}->[0],	"<",	100000,	"pid check upper" );
 cmp_ok( $viewer->{pids}->[1],	">",	1,	"ppid check lower" );
 cmp_ok( $viewer->{pids}->[1],	"<",	100000,	"ppid check upper" );
 cmp_ok( $viewer->{pids}->[2],	">",	1,	"pgrp check lower" );
 cmp_ok( $viewer->{pids}->[2],	"<",	100000,	"pgrp check upper" );
-is( $viewer->{ntus}, 1, "translation unit count" );
 
-my @known_good = [ [ "source_0.c", 8, 2 ] ];
-$viewer->cmp_static_data(@known_good);
+$viewer->cmp_static_data([ [ "source_0.c", 7, 2 ] ]);
 
 $project->kill();
 my ($ret, $err) = $project->wait();