citrun

commit beeff3e3140ac03afc9617706e02eba9fdf1787b
parent feb644841d624a3a1ba30e824bad6570f392776e
Author: Kyle Milz <kyle@0x30.net>
Date:   Sun, 18 Dec 2016 16:57:32 -0700

t: merge tmpdir.pm into shm.pm

Diffstat:
M
t/lib_exectotals.t
 | 
1
-
M
t/lib_header.t
 | 
1
-
M
t/lib_size.t
 | 
1
-
M
t/lib_transunit.t
 | 
1
-
M
t/shm.pm
 | 
17
++++++++++++++++-
D
t/tmpdir.pm
 | 
21
---------------------

6 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/t/lib_exectotals.t b/t/lib_exectotals.t
@@ -6,7 +6,6 @@ use warnings;
 use Test::More tests => 26;
 use Time::HiRes qw( time usleep );
 use t::shm;
-use t::tmpdir;
 
 my $tmp_dir = t::tmpdir->new();
 
diff --git a/t/lib_header.t b/t/lib_header.t
@@ -5,7 +5,6 @@ use strict;
 use warnings;
 use Test::More tests => 16;
 use t::shm;
-use t::tmpdir;
 
 my $tmp_dir = t::tmpdir->new();
 
diff --git a/t/lib_size.t b/t/lib_size.t
@@ -6,7 +6,6 @@ use warnings;
 use POSIX;
 use Test::More tests => 3;
 use t::shm;
-use t::tmpdir;
 
 my $tmp_dir = t::tmpdir->new();
 
diff --git a/t/lib_transunit.t b/t/lib_transunit.t
@@ -5,7 +5,6 @@ use strict;
 use warnings;
 use Test::More tests => 8;
 use t::shm;
-use t::tmpdir;
 
 my $tmp_dir = t::tmpdir->new();
 
diff --git a/t/shm.pm b/t/shm.pm
@@ -1,6 +1,21 @@
-package t::shm;
 use strict;
 use warnings;
+
+package t::tmpdir;
+use File::Copy;
+use File::Temp qw( tempdir );
+
+sub new {
+	my $tmp_dir = tempdir( CLEANUP => 1 );
+	$ENV{CITRUN_PROCDIR} = "$tmp_dir/procdir/";
+
+	copy($_, $tmp_dir) while (<t/program/*>);
+	system("src/citrun-wrap make -C $tmp_dir");
+
+	return $tmp_dir;
+}
+
+package t::shm;
 use Inline 'C';
 use POSIX;
 
diff --git a/t/tmpdir.pm b/t/tmpdir.pm
@@ -1,21 +0,0 @@
-package t::tmpdir;
-use strict;
-use warnings;
-use File::Copy;
-use File::Temp qw( tempdir );
-
-sub new {
-	my $tmp_dir = tempdir( CLEANUP => 1 );
-	$ENV{CITRUN_PROCDIR} = "$tmp_dir/procdir/";
-
-	copy("t/program/Makefile", $tmp_dir);
-	copy("t/program/main.c", $tmp_dir);
-	copy("t/program/print.c", $tmp_dir);
-	copy("t/program/fib.c", $tmp_dir);
-
-	system("src/citrun-wrap make -C $tmp_dir");
-
-	return $tmp_dir;
-}
-
-1;