citrun

commit 2b7842aa7c56250ccbbec16ea27cab4f79984662
parent f7051e490ff8aa48e8b974cbcc82d4d816949e04
Author: Kyle Milz <kyle@0x30.net>
Date:   Thu,  4 Aug 2016 21:45:45 -0600

Test: put build commands in single script

Diffstat:
M
Test/Package.pm
 | 
27
++++++++++-----------------
M
tt/nvi.t
 | 
5
+----
M
tt/openssl.t
 | 
7
+------

3 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/Test/Package.pm b/Test/Package.pm
@@ -14,35 +14,28 @@ sub new {
 	my $dir = tempdir( CLEANUP => 1 );
 	$self->{dir} = $dir;
 
-	$self->{portsdir} = "/usr/ports";
-	$self->{port} = "$self->{portsdir}/$name";
+	$self->{port} = "/usr/ports/$name";
 
 	$ENV{CITRUN_SOCKET} = $self->{dir} . "/test.socket";
 
-	return $self;
-}
+	system(<<EOF) == 0 or die "build failed.";
+set -e
+make -C $self->{port} full-build-depends > $self->{dir}/deps
+pkg_info citrun > /dev/null
+doas pkg_add -zl $self->{dir}/deps
 
-sub depends {
-	my ($self) = @_;
+make -C $self->{port} clean=all
+make -C $self->{port} PORTPATH="/usr/local/share/citrun:\\\${WRKDIR}/bin:\$PATH"
+EOF
 
-	system("make -C $self->{port} full-build-depends > $self->{dir}/deps") == 0
-		or die "$!";
-	system("doas pkg_add -zl $self->{dir}/deps") == 0 or die "$!";
+	return $self;
 }
 
 sub clean {
 	my ($self) = @_;
-
 	system("make -C $self->{port} clean=all") == 0 or die "$!";
 }
 
-sub build {
-	my ($self) = @_;
-
-	system("make -C $self->{port} PORTPATH=\"/home/kyle/citrun/src:\\\${WRKDIR}/bin:\$PATH\"") == 0
-		or die "$!";
-}
-
 sub get_file_size {
 	my ($self, $file) = @_;
 
diff --git a/tt/nvi.t b/tt/nvi.t
@@ -10,10 +10,6 @@ use Test::Viewer;
 my $package = Test::Package->new("editors/nvi");
 my $viewer = Test::Viewer->new();
 
-$package->depends();
-$package->clean();
-$package->build();
-
 my $exp = Expect->spawn("/usr/ports/pobj/nvi-2.1.3/nvi2-2.1.3/build/nvi");
 
 my @known_good = (
@@ -144,4 +140,5 @@ $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
@@ -8,13 +8,8 @@ use Test::Report;
 use Test::Viewer;
 
 my $package = Test::Package->new("security/openssl");
-
-$package->depends();
-$package->clean();
-$package->build();
-
-# Verify: instrumented data structures are consistent.
 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");