commit cf7963822e1efbd3225ead36ab3538f7ebb268f2
parent 6987bedb4002e844f21e04759a7f58411c6f1303
Author: Kyle Milz <kyle@0x30.net>
Date: Sun, 31 Jul 2016 12:43:45 -0600
t: set CITRUN_SOCKET explicitly per test
Diffstat:
13 files changed, 22 insertions(+), 35 deletions(-)
diff --git a/Test/Project.pm b/Test/Project.pm
@@ -56,8 +56,6 @@ EOF
sub run {
my ($self, @args) = @_;
- $ENV{CITRUN_SOCKET} = "citrun-test.socket";
-
my $tmp_dir = $self->{tmp_dir};
$self->{pid} = open2(\*CHLD_OUT, undef, "$tmp_dir/$self->{prog_name}", @args);
}
@@ -81,11 +79,10 @@ sub wait {
return ($real_ret, $stderr);
}
-sub get_tmpdir {
+sub tmpdir {
my ($self) = @_;
return "/private$self->{tmp_dir}" if ($^O eq 'darwin');
-
return $self->{tmp_dir};
}
diff --git a/Test/Viewer.pm b/Test/Viewer.pm
@@ -5,16 +5,15 @@ use IO::Socket::UNIX;
use List::MoreUtils qw( each_array );
use Test::More;
-my $viewer_socket_name = "citrun-test.socket";
-
sub new {
my ($class) = @_;
my $self = {};
bless ($self, $class);
+ $self->{viewer_socket_name} = $ENV{CITRUN_SOCKET};
my $viewer_socket = IO::Socket::UNIX->new(
Type => SOCK_STREAM(),
- Local => $viewer_socket_name,
+ Local => $self->{viewer_socket_name},
Listen => 1
);
die "socket error: $!\n" unless ($viewer_socket);
@@ -169,7 +168,7 @@ sub DESTROY {
my ($self) = @_;
close($self->{viewer_socket});
- unlink $viewer_socket_name;
+ unlink $self->{viewer_socket_name};
}
1;
diff --git a/t/fibonacci.t b/t/fibonacci.t
@@ -3,8 +3,9 @@ use Test::More tests => 5;
use Test::Project;
use Test::Viewer;
-my $viewer = Test::Viewer->new();
my $project = Test::Project->new();
+$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
+my $viewer = Test::Viewer->new();
$project->add_src(<<EOF);
#include <stdio.h>
diff --git a/t/hello_world.t b/t/hello_world.t
@@ -3,8 +3,9 @@ use Test::More tests => 2;
use Test::Project;
use Test::Viewer;
-my $viewer = Test::Viewer->new();
my $project = Test::Project->new();
+$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
+my $viewer = Test::Viewer->new();
$project->add_src(<<EOF);
#include <stdio.h>
diff --git a/t/inst_for.t b/t/inst_for.t
@@ -3,8 +3,9 @@ use Test::More tests => 1;
use Test::Project;
use Test::Viewer;
-my $viewer = Test::Viewer->new();
my $project = Test::Project->new();
+$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
+my $viewer = Test::Viewer->new();
$project->add_src(<<EOF);
int
diff --git a/t/inst_if.t b/t/inst_if.t
@@ -1,5 +1,4 @@
use strict;
-
use Test::More tests => 1;
use Test::Project;
diff --git a/t/inst_multi_source.t b/t/inst_multi_source.t
@@ -1,14 +1,11 @@
use strict;
-
use Test::More tests => 1;
-use Test::Differences;
-
use Test::Project;
use Test::Viewer;
-my $viewer = Test::Viewer->new();
my $project = Test::Project->new();
-unified_diff;
+$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
+my $viewer = Test::Viewer->new();
$project->add_src(<<EOF
void second_func();
diff --git a/t/inst_return.t b/t/inst_return.t
@@ -1,11 +1,11 @@
use strict;
-
use Test::More tests => 1;
use Test::Project;
use Test::Viewer;
-my $viewer = Test::Viewer->new();
my $project = Test::Project->new();
+$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
+my $viewer = Test::Viewer->new();
$project->add_src(<<EOF);
int foo() {
diff --git a/t/inst_switch.t b/t/inst_switch.t
@@ -3,8 +3,9 @@ use Test::More tests => 1;
use Test::Project;
use Test::Viewer;
-my $viewer = Test::Viewer->new();
my $project = Test::Project->new();
+$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
+my $viewer = Test::Viewer->new();
$project->add_src(<<EOF);
int
diff --git a/t/rt_counters_increase.t b/t/rt_counters_increase.t
@@ -1,15 +1,11 @@
use strict;
-
-use Data::Dumper;
use Test::More tests => 19;
-use Test::Differences;
-
use Test::Project;
use Test::Viewer;
my $project = Test::Project->new();
+$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
my $viewer = Test::Viewer->new();
-unified_diff;
$project->add_src(<<EOF);
#include <err.h>
diff --git a/t/rt_metadata.t b/t/rt_metadata.t
@@ -1,12 +1,11 @@
use strict;
-
use Test::More tests => 13;
-
use Test::Project;
use Test::Viewer;
-my $viewer = Test::Viewer->new();
my $project = Test::Project->new();
+$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
+my $viewer = Test::Viewer->new();
$project->add_src(<<EOF);
int
diff --git a/t/rt_reconnect.t b/t/rt_reconnect.t
@@ -1,11 +1,10 @@
use strict;
-
use Test::More tests => 13;
-
use Test::Project;
use Test::Viewer;
my $project = Test::Project->new();
+$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
$project->add_src(<<EOF);
int
diff --git a/t/rt_sanity.t b/t/rt_sanity.t
@@ -1,15 +1,12 @@
use strict;
-
use Cwd;
use Test::More tests => 62;
-use Test::Differences;
-
use Test::Project;
use Test::Viewer;
-my $viewer = Test::Viewer->new();
my $project = Test::Project->new();
-unified_diff;
+$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
+my $viewer = Test::Viewer->new();
$project->add_src(<<EOF);
#include <err.h>
