X-Git-Url: http://git.refcnt.org/?a=blobdiff_plain;f=t%2Fmerge.t;h=a234b126d7c28710b270c3cbfdc634bf05071e1c;hb=9082b6aa7b7bd32db92ed1bd8ebe31e836147704;hp=74db86bc109470bf156edf536f70ad0cebb84f03;hpb=bf223df46d9b78354c2045170e93385efe73a7f4;p=colorize.git

diff --git a/t/merge.t b/t/merge.t
index 74db86b..a234b12 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
@@ -103,7 +103,7 @@ my $compile = sub
     my ($buf_size) = @_;
     return true if exists $programs{$buf_size};
     my $program = tmpnam();
-    return false unless system("$compiler -DTEST_MERGE_PART_LINE -DBUF_SIZE=$buf_size -o $program $source") == 0;
+    return false unless system("$compiler -DTEST -DTEST_MERGE_PART_LINE -DBUF_SIZE=$buf_size -o $program $source") == 0;
     $programs{$buf_size} = $program;
     return true; # compiling succeeded
 };
@@ -117,12 +117,14 @@ my $test_name = sub
     return "$sequence: $substr";
 };
 
+my $compiling_failed_msg = 'compiling failed (merge part line)';
+
 plan tests => $tests;
 
 foreach my $test (@merge_success) {
     foreach my $buf_size (@{$test->[1]}) {
         SKIP: {
-            skip 'compiling failed (merge part line)', 1 unless $compile->($buf_size);
+            skip $compiling_failed_msg, 1 unless $compile->($buf_size);
             ok(qx(printf %s "$test->[0]" | $programs{$buf_size} --clean) eq $test->[0], 'merge success: ' . $test_name->($test->[0], $buf_size));
         }
     }
@@ -130,14 +132,14 @@ foreach my $test (@merge_success) {
 foreach my $test (@merge_fail) {
     my $buf_size = $test->[1];
     SKIP: {
-        skip 'compiling failed (merge part line)', 1 unless $compile->($buf_size);
+        skip $compiling_failed_msg, 1 unless $compile->($buf_size);
         ok(qx(printf %s "$test->[0]" | $programs{$buf_size} --clean) eq substr($test->[0], 0, $buf_size), 'merge fail: ' . $test_name->($test->[0], $buf_size));
     }
 }
 foreach my $test (@buffer) {
     my $buf_size = length($test) - 1;
     SKIP: {
-        skip 'compiling failed (merge part line)', 1 unless $compile->($buf_size);
+        skip $compiling_failed_msg, 1 unless $compile->($buf_size);
         ok(qx(printf %s "$test" | $programs{$buf_size} --clean) eq substr($test, 0, $buf_size), 'buffer: ' . $test_name->($test, $buf_size));
     }
 }
@@ -145,7 +147,7 @@ foreach my $test (@pushback) {
     my $buf_size = $test->[1];
     SKIP: {
         my $program = tmpnam();
-        skip 'compiling failed (merge part line)', 1 unless system("$compiler -DBUF_SIZE=$buf_size -o $program $source") == 0;
+        skip $compiling_failed_msg, 1 unless system("$compiler -DTEST -DBUF_SIZE=$buf_size -o $program $source") == 0;
         ok(qx(printf %s "$test->[0]" | $program --clean) eq $test->[0], 'pushback: ' . $test_name->($test->[0], $buf_size));
         unlink $program;
     }