aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Steven Schubiger <stsc@refcnt.org> 2016-07-19 13:54:47 +0200
committerGravatar Steven Schubiger <stsc@refcnt.org> 2016-07-19 13:54:47 +0200
commit3585dd50b9428db6691512575181da97b10e967b (patch)
tree740bd1033725732459713a50d404338cf0c2783a
parent3fea379ff56e28600ec70fbabfa0392cf8dfac08 (diff)
downloadcolorize-3585dd50b9428db6691512575181da97b10e967b.tar.gz
colorize-3585dd50b9428db6691512575181da97b10e967b.tar.bz2
Move common data to a perl module
-rw-r--r--lib/Colorize/Common.pm45
-rwxr-xr-xt/fail.t18
-rwxr-xr-xt/merge.t4
-rwxr-xr-xtest.pl23
4 files changed, 53 insertions, 37 deletions
diff --git a/lib/Colorize/Common.pm b/lib/Colorize/Common.pm
new file mode 100644
index 0000000..e61450b
--- /dev/null
+++ b/lib/Colorize/Common.pm
@@ -0,0 +1,45 @@
+package Colorize::Common;
+
+use strict;
+use warnings;
+use base qw(Exporter);
+use constant true => 1;
+
+use File::Temp qw(tempfile);
+
+our (@EXPORT_OK, %EXPORT_TAGS);
+my @defaults;
+
+@defaults = qw($source $compiler);
+@EXPORT_OK = (qw($compiler_flags %BUF_SIZE $write_to_tmpfile), @defaults);
+%EXPORT_TAGS = ('defaults' => [ @defaults ]);
+
+our ($source, $compiler, $compiler_flags, %BUF_SIZE, $write_to_tmpfile);
+
+#---------------#
+# START of data #
+#---------------#
+
+$source = 'colorize.c';
+$compiler = 'gcc';
+$compiler_flags = '-ansi -pedantic -Wall -Wextra -Wformat -Wswitch-default -Wuninitialized -Wunused -Wno-unused-function -Wno-unused-parameter';
+%BUF_SIZE = (
+ normal => 1024,
+ short => 10,
+);
+$write_to_tmpfile = sub
+{
+ my ($content) = @_;
+
+ my ($fh, $tmpfile) = tempfile(UNLINK => true);
+ print {$fh} $content;
+ close($fh);
+
+ return $tmpfile;
+};
+
+#-------------#
+# END of data #
+#-------------#
+
+1;
diff --git a/t/fail.t b/t/fail.t
index b7f0dcb..a72e9ab 100755
--- a/t/fail.t
+++ b/t/fail.t
@@ -2,30 +2,18 @@
use strict;
use warnings;
+use lib qw(lib);
use constant true => 1;
use constant false => 0;
-use File::Temp qw(tempfile tempdir tmpnam);
+use Colorize::Common qw(:defaults $write_to_tmpfile);
+use File::Temp qw(tempdir tmpnam);
use IPC::Open3 qw(open3);
use Symbol qw(gensym);
use Test::More;
my $tests = 20;
-my $source = 'colorize.c';
-my $compiler = 'gcc';
-
-my $write_to_tmpfile = sub
-{
- my ($content) = @_;
-
- my ($fh, $tmpfile) = tempfile(UNLINK => true);
- print {$fh} $content;
- close($fh);
-
- return $tmpfile;
-};
-
my $run_program_fail = sub
{
my ($program, $args, $message) = @_;
diff --git a/t/merge.t b/t/merge.t
index e2f0de6..848c022 100755
--- a/t/merge.t
+++ b/t/merge.t
@@ -2,9 +2,11 @@
use strict;
use warnings;
+use lib qw(lib);
use constant true => 1;
use constant false => 0;
+use Colorize::Common ':defaults';
use File::Temp qw(tmpnam);
use Test::More;
@@ -94,8 +96,6 @@ $tests += @merge_fail;
$tests += @buffer;
$tests += @pushback;
-my $source = 'colorize.c';
-my $compiler = 'gcc';
my %programs;
my $compile = sub
diff --git a/test.pl b/test.pl
index 570a7b7..476cb7a 100755
--- a/test.pl
+++ b/test.pl
@@ -2,34 +2,17 @@
use strict;
use warnings;
+use lib qw(lib);
use constant true => 1;
use constant false => 0;
-use File::Temp qw(tempfile tmpnam);
+use Colorize::Common qw(:defaults $compiler_flags %BUF_SIZE $write_to_tmpfile);
+use File::Temp qw(tmpnam);
use Test::Harness qw(runtests);
use Test::More;
my $tests = 24;
-my %BUF_SIZE = (
- normal => 1024,
- short => 10,
-);
-my $source = 'colorize.c';
-my $compiler = 'gcc';
-my $compiler_flags = '-ansi -pedantic -Wall -Wextra -Wformat -Wswitch-default -Wuninitialized -Wunused -Wno-unused-function -Wno-unused-parameter';
-
-my $write_to_tmpfile = sub
-{
- my ($content) = @_;
-
- my ($fh, $tmpfile) = tempfile(UNLINK => true);
- print {$fh} $content;
- close($fh);
-
- return $tmpfile;
-};
-
{
my @test_files = glob('t/*.t');
eval { runtests(@test_files) } or warn $@;