X-Git-Url: http://git.refcnt.org/?a=blobdiff_plain;f=test.pl;h=8d8b592895def338f13a8723414f8aaa5d9e2b8f;hb=refs%2Ftags%2Fv0.54;hp=49a0cf38fae6cce73c46f4f00b5a97673137ad01;hpb=4f6ff00bd402a74d794214f3c58c19b98eafa756;p=colorize.git

diff --git a/test.pl b/test.pl
index 49a0cf3..8d8b592 100755
--- a/test.pl
+++ b/test.pl
@@ -5,7 +5,7 @@ use warnings;
 use constant true  => 1;
 use constant false => 0;
 
-use File::Temp qw(tempfile tmpnam);
+use File::Temp qw(tempfile tempdir tmpnam);
 use IPC::Open3 qw(open3);
 use Symbol qw(gensym);
 use Test::More;
@@ -17,7 +17,7 @@ my %BUF_SIZE = (
    short  => 10,
 );
 my $source = 'colorize.c';
-my $warning_flags = '-Wall -Wextra -Wformat -Wswitch-default -Wuninitialized -Wunused -Wno-unused-function -Wno-unused-parameter';
+my $compiler_flags = '-ansi -pedantic -Wall -Wextra -Wformat -Wswitch-default -Wuninitialized -Wunused -Wno-unused-function -Wno-unused-parameter';
 
 my $write_to_tmpfile = sub
 {
@@ -35,8 +35,12 @@ plan tests => $tests;
 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;
+    unlink $binary;
+
     my $program = tmpnam();
-    skip 'compiling failed (normal)', $tests unless system("gcc -DTEST -DBUF_SIZE=$BUF_SIZE{normal} $warning_flags -o $program $source") == 0;
+    skip 'compiling failed (normal)', $tests unless system("gcc -DTEST -DBUF_SIZE=$BUF_SIZE{normal} -o $program $source") == 0;
 
     is(system("$program --help >/dev/null 2>&1"), 0, 'exit value for help screen');
 
@@ -60,6 +64,7 @@ SKIP: {
         my $ok = true;
 
         my $file = $write_to_tmpfile->('abc');
+        my $dir  = tempdir(CLEANUP => true);
 
         $ok &= $run_program_fail->($program, '--exclude-random=random', 'must be provided a plain color');
         $ok &= $run_program_fail->($program, '--clean --clean-all',     'mutually exclusive');
@@ -67,8 +72,9 @@ SKIP: {
         $ok &= $run_program_fail->($program, '--clean-all file1 file2', 'more than one file');
         $ok &= $run_program_fail->($program, '- file',                  'hyphen cannot be used as color string');
         $ok &= $run_program_fail->($program, '-',                       'hyphen must be preceeded by color string');
-        $ok &= $run_program_fail->($program, "$file file",              'file cannot be used as color string');
-        $ok &= $run_program_fail->($program, "$file",                   'file must be preceeded by color string');
+        $ok &= $run_program_fail->($program, "$file file",              'cannot be used as color string');
+        $ok &= $run_program_fail->($program, "$file",                   'must be preceeded by color string');
+        $ok &= $run_program_fail->($program, "$dir",                    'is not a valid file type');
         $ok &= $run_program_fail->($program, '/black',                  'foreground color missing');
         $ok &= $run_program_fail->($program, 'white/',                  'background color missing');
         $ok &= $run_program_fail->($program, 'white/black/yellow',      'one color pair allowed only');
@@ -139,7 +145,7 @@ SKIP: {
 
     SKIP: {
         my $program_buf = tmpnam();
-        skip 'compiling failed (short buffer)', 2 unless system("gcc -DTEST -DBUF_SIZE=$BUF_SIZE{short} $warning_flags -o $program_buf $source") == 0;
+        skip 'compiling failed (short buffer)', 2 unless system("gcc -DTEST -DBUF_SIZE=$BUF_SIZE{short} -o $program_buf $source") == 0;
         $check_clean_buf->($program_buf, $_) foreach qw(clean clean-all);
         unlink $program_buf;
     }
@@ -169,7 +175,7 @@ SKIP: {
 Colors
 ======
 EOT
-    foreach my $color (qw(none black red green yellow blue cyan magenta white default random)) {
+    foreach my $color (qw(none black red green yellow blue magenta cyan white default random)) {
         system("echo $color | $program $color");
         next if $color eq 'none';
         my $bold_color = ucfirst $color;