X-Git-Url: http://git.refcnt.org/?a=blobdiff_plain;f=t%2Fmerge.t;h=a234b126d7c28710b270c3cbfdc634bf05071e1c;hb=d00039e462c0a8720d6e19ee599d1eba046d1a5f;hp=e2f0de6fa22757813c2055985ee673c0c8d62574;hpb=907c1a6426658e93ed5b10ecb0852397b87855ba;p=colorize.git

diff --git a/t/merge.t b/t/merge.t
index e2f0de6..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
 };
@@ -147,7 +147,7 @@ foreach my $test (@pushback) {
     my $buf_size = $test->[1];
     SKIP: {
         my $program = tmpnam();
-        skip $compiling_failed_msg, 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;
     }