commit d8a0d47e24e70d64a3e589c940ac17b189e23196
parent 292aa822826462b24bad9893bf84f55b633983de
Author: Kyle Milz <kyle@0x30.net>
Date: Thu, 4 Aug 2016 23:36:44 -0600
Test: move CITRUN_SOCKET setting into Project
Diffstat:
14 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/Test/Project.pm b/Test/Project.pm
@@ -15,6 +15,11 @@ sub new {
$self->{tmp_dir} = tempdir( CLEANUP => 1 );
$self->{src_files} = [];
$self->{prog_name} = "program";
+
+ my $tmp_dir = $self->{tmp_dir};
+ $tmp_dir = "/private$self->{tmp_dir}" if ($^O eq 'darwin');
+ $ENV{CITRUN_SOCKET} = "$tmp_dir/test.socket";
+
return $self;
}
@@ -79,13 +84,6 @@ sub wait {
return ($real_ret, $stderr);
}
-sub tmpdir {
- my ($self) = @_;
-
- return "/private$self->{tmp_dir}" if ($^O eq 'darwin');
- return $self->{tmp_dir};
-}
-
sub DESTROY {
my ($self) = @_;
diff --git a/t/fibonacci.t b/t/fibonacci.t
@@ -4,7 +4,6 @@ use Test::Project;
use Test::Viewer;
my $project = Test::Project->new();
-$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
my $viewer = Test::Viewer->new();
$project->add_src(<<EOF);
diff --git a/t/hello_world.t b/t/hello_world.t
@@ -4,7 +4,6 @@ use Test::Project;
use Test::Viewer;
my $project = Test::Project->new();
-$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
my $viewer = Test::Viewer->new();
$project->add_src(<<EOF);
diff --git a/t/inst_for.t b/t/inst_for.t
@@ -4,7 +4,6 @@ use Test::Project;
use Test::Viewer;
my $project = Test::Project->new();
-$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
my $viewer = Test::Viewer->new();
$project->add_src(<<EOF);
diff --git a/t/inst_if.t b/t/inst_if.t
@@ -4,7 +4,6 @@ use Test::Project;
use Test::Viewer;
my $project = Test::Project->new();
-$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
my $viewer = Test::Viewer->new();
$project->add_src(<<EOF);
diff --git a/t/inst_multi_source.t b/t/inst_multi_source.t
@@ -4,7 +4,6 @@ use Test::Project;
use Test::Viewer;
my $project = Test::Project->new();
-$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
my $viewer = Test::Viewer->new();
$project->add_src(<<EOF
diff --git a/t/inst_return.t b/t/inst_return.t
@@ -4,7 +4,6 @@ use Test::Project;
use Test::Viewer;
my $project = Test::Project->new();
-$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
my $viewer = Test::Viewer->new();
$project->add_src(<<EOF);
diff --git a/t/inst_switch.t b/t/inst_switch.t
@@ -4,7 +4,6 @@ use Test::Project;
use Test::Viewer;
my $project = Test::Project->new();
-$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
my $viewer = Test::Viewer->new();
$project->add_src(<<EOF);
diff --git a/t/inst_while.t b/t/inst_while.t
@@ -4,7 +4,6 @@ use Test::Project;
use Test::Viewer;
my $project = Test::Project->new();
-$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
my $viewer = Test::Viewer->new();
$project->add_src(<<EOF);
diff --git a/t/rt_counters_increase.t b/t/rt_counters_increase.t
@@ -4,7 +4,6 @@ use Test::Project;
use Test::Viewer;
my $project = Test::Project->new();
-$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
my $viewer = Test::Viewer->new();
$project->add_src(<<EOF);
diff --git a/t/rt_metadata.t b/t/rt_metadata.t
@@ -4,7 +4,6 @@ use Test::Project;
use Test::Viewer;
my $project = Test::Project->new();
-$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
my $viewer = Test::Viewer->new();
$project->add_src(<<EOF);
diff --git a/t/rt_reconnect.t b/t/rt_reconnect.t
@@ -4,7 +4,6 @@ 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
@@ -5,7 +5,6 @@ use Test::Project;
use Test::Viewer;
my $project = Test::Project->new();
-$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
my $viewer = Test::Viewer->new();
$project->add_src(<<EOF);
diff --git a/t/term_basic.t b/t/term_basic.t
@@ -4,7 +4,6 @@ use Test::More tests => 1;
use Test::Project;
my $project = Test::Project->new();
-$ENV{CITRUN_SOCKET} = $project->tmpdir() . "/test.socket";
$project->add_src(<<EOF);
int