From bf223df46d9b78354c2045170e93385efe73a7f4 Mon Sep 17 00:00:00 2001 From: Steven Schubiger Date: Wed, 16 Mar 2016 12:56:33 +0100 Subject: Set compiler once for tests --- t/merge.t | 5 +++-- test.pl | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/t/merge.t b/t/merge.t index 8a4aee3..74db86b 100755 --- a/t/merge.t +++ b/t/merge.t @@ -95,6 +95,7 @@ $tests += @buffer; $tests += @pushback; my $source = 'colorize.c'; +my $compiler = 'gcc'; my %programs; my $compile = sub @@ -102,7 +103,7 @@ my $compile = sub my ($buf_size) = @_; return true if exists $programs{$buf_size}; my $program = tmpnam(); - return false unless system("gcc -DTEST_MERGE_PART_LINE -DBUF_SIZE=$buf_size -o $program $source") == 0; + return false unless system("$compiler -DTEST_MERGE_PART_LINE -DBUF_SIZE=$buf_size -o $program $source") == 0; $programs{$buf_size} = $program; return true; # compiling succeeded }; @@ -144,7 +145,7 @@ foreach my $test (@pushback) { my $buf_size = $test->[1]; SKIP: { my $program = tmpnam(); - skip 'compiling failed (merge part line)', 1 unless system("gcc -DBUF_SIZE=$buf_size -o $program $source") == 0; + skip 'compiling failed (merge part line)', 1 unless system("$compiler -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; } diff --git a/test.pl b/test.pl index ee51472..40c3cb5 100755 --- a/test.pl +++ b/test.pl @@ -18,6 +18,7 @@ my %BUF_SIZE = ( 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 @@ -42,11 +43,11 @@ SKIP: { skip "$source does not exist", $tests unless -e $source; my $binary = tmpnam(); - skip 'compiling failed', $tests unless system("gcc $compiler_flags -o $binary $source") == 0; + skip 'compiling failed', $tests unless system("$compiler $compiler_flags -o $binary $source") == 0; unlink $binary; my $program = tmpnam(); - skip 'compiling failed (normal)', $tests unless system("gcc -DTEST -DBUF_SIZE=$BUF_SIZE{normal} -o $program $source") == 0; + skip 'compiling failed (normal)', $tests unless system("$compiler -DTEST -DBUF_SIZE=$BUF_SIZE{normal} -o $program $source") == 0; is(system("$program --help >/dev/null 2>&1"), 0, 'exit value for help screen'); is(system("$program --version >/dev/null 2>&1"), 0, 'exit value for version data'); @@ -152,7 +153,7 @@ SKIP: { SKIP: { my $program_buf = tmpnam(); - skip 'compiling failed (short buffer)', 2 unless system("gcc -DTEST -DBUF_SIZE=$BUF_SIZE{short} -o $program_buf $source") == 0; + skip 'compiling failed (short buffer)', 2 unless system("$compiler -DTEST -DBUF_SIZE=$BUF_SIZE{short} -o $program_buf $source") == 0; $check_clean_buf->($program_buf, $_) foreach qw(clean clean-all); unlink $program_buf; } @@ -180,7 +181,7 @@ SKIP: { { my $debug = tmpnam(); - is(system("gcc -DDEBUG -o $debug $source"), 0, 'debugging build'); + is(system("$compiler -DDEBUG -o $debug $source"), 0, 'debugging build'); unlink $debug if -e $debug; } -- cgit v1.2.3