commit 570bae681da650045ddb5263b60b3c8ab90ca94d
parent f55d3401f9f01e36cb3e7ba126d7c2f8a598b5c4
Author: Kyle Milz <kyle@0x30.net>
Date: Fri, 5 Aug 2016 15:13:03 -0600
Test: check number of tus in cmp_static_data
Diffstat:
8 files changed, 15 insertions(+), 31 deletions(-)
diff --git a/Test/Package.pm b/Test/Package.pm
@@ -33,6 +33,7 @@ EOF
sub clean {
my ($self) = @_;
+ #system("citrun-check /usr/ports/pobj/$self->{port}-*");
system("make -C $self->{port} clean=all") == 0 or die "$!";
}
diff --git a/t/rt_counters_increase.t b/t/rt_counters_increase.t
@@ -1,5 +1,5 @@
use strict;
-use Test::More tests => 13;
+use Test::More tests => 14;
use Test::Project;
use Test::Viewer;
diff --git a/t/rt_dynamic.t b/t/rt_dynamic.t
@@ -1,5 +1,5 @@
use strict;
-use Test::More tests => 111;
+use Test::More tests => 112;
use Test::Project;
use Test::Viewer;
use Time::HiRes qw( usleep );
diff --git a/t/rt_reconnect.t b/t/rt_reconnect.t
@@ -1,5 +1,5 @@
use strict;
-use Test::More tests => 7;
+use Test::More tests => 8;
use Test::Project;
use Test::Viewer;
diff --git a/t/rt_static.t b/t/rt_static.t
@@ -1,6 +1,6 @@
use strict;
use Cwd;
-use Test::More tests => 19;
+use Test::More tests => 20;
use Test::Project;
use Test::Viewer;
diff --git a/tt/mutt.t b/tt/mutt.t
@@ -2,7 +2,7 @@ use strict;
use warnings;
use Expect;
-use Test::More tests => 402;
+use Test::More tests => 406;
use Test::Package;
use Test::Viewer;
@@ -10,8 +10,8 @@ my $package = Test::Package->new("mail/mutt");
my $viewer = Test::Viewer->new();
my $exp = Expect->spawn("/usr/ports/pobj/mutt-1.6.2/mutt-1.6.2/mutt");
-
-my @known_good = (
+$viewer->accept();
+$viewer->cmp_static_data([
# file name lines instrumented sites
["/account.c", 241, 89],
["/addrbook.c", 246, 98],
@@ -115,11 +115,6 @@ my @known_good = (
["/thread.c", 1431, 386],
["/url.c", 325, 164],
);
-
-$viewer->accept();
-is( $viewer->{ntus}, scalar @known_good, "translation unit count" );
-
-$viewer->cmp_static_data(\@known_good);
$viewer->cmp_dynamic_data();
$exp->hard_close();
diff --git a/tt/nvi.t b/tt/nvi.t
@@ -1,6 +1,5 @@
use strict;
use warnings;
-
use Expect;
use Test::More tests => 458 ;
use Test::Package;
@@ -11,8 +10,8 @@ my $package = Test::Package->new("editors/nvi");
my $viewer = Test::Viewer->new();
my $exp = Expect->spawn("/usr/ports/pobj/nvi-2.1.3/nvi2-2.1.3/build/nvi");
-
-my @known_good = (
+$viewer->accept();
+$viewer->cmp_static_data([
["cl/cl_funcs.c", 853, 192],
["cl/cl_main.c", 423, 111],
["cl/cl_read.c", 331, 73],
@@ -127,12 +126,7 @@ my @known_good = (
["vi/vs_relative.c", 295, 49],
["vi/vs_smap.c", 1243, 379],
["vi/vs_split.c", 950, 172],
-);
-
-$viewer->accept();
-is( $viewer->{ntus}, scalar @known_good, "translation unit count" );
-
-$viewer->cmp_static_data(\@known_good);
+]);
# Check that at least something has executed.
$viewer->cmp_dynamic_data();
@@ -140,5 +134,4 @@ $viewer->cmp_dynamic_data();
$exp->hard_close();
$viewer->close();
-system("citrun-check /usr/ports/pobj/nvi-2.1.3");
$package->clean();
diff --git a/tt/openssl.t b/tt/openssl.t
@@ -1,6 +1,5 @@
use strict;
use warnings;
-
use Expect;
use Test::More tests => 2734 ;
use Test::Package;
@@ -12,8 +11,8 @@ my $viewer = Test::Viewer->new();
$ENV{LD_LIBRARY_PATH}="/usr/ports/pobj/openssl-1.0.2h/openssl-1.0.2h";
my $exp = Expect->spawn("/usr/ports/pobj/openssl*/openssl*/apps/openssl");
-
-my @known_good = (
+$viewer->accept();
+$viewer->cmp_static_data([
["apps/app_rand.c", 218, 56],
["apps/apps.c", 3229, 1018],
["apps/asn1pars.c", 431, 189],
@@ -697,12 +696,7 @@ my @known_good = (
["ssl/t1_srvr.c", 93, 14],
["ssl/t1_trce.c", 1267, 5],
["ssl/tls_srp.c", 543, 176],
-);
-
-$viewer->accept();
-is( $viewer->{ntus}, scalar @known_good, "translation unit count" );
-
-$viewer->cmp_static_data(\@known_good);
+]);
# Check that at least something has executed.
$viewer->cmp_dynamic_data();
@@ -710,4 +704,5 @@ $viewer->cmp_dynamic_data();
$exp->hard_close();
$viewer->close();
+system("citrun-check /usr/ports/pobj/openssl-*");
$package->clean();
