X-Git-Url: http://git.refcnt.org/?a=blobdiff_plain;f=test.pl;h=30c1fd142026567ab241a937b88b7fd73d425cec;hb=f77dfa416cafc1a9db80349b31e6cb82e7f0491d;hp=5dc3bf38084491591377a33154bef1ba93313d5b;hpb=7fa6356c30c8eb5988abe73ed47444327cbd6346;p=colorize.git

diff --git a/test.pl b/test.pl
index 5dc3bf3..30c1fd1 100755
--- a/test.pl
+++ b/test.pl
@@ -5,12 +5,13 @@ 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::Harness qw(runtests);
 use Test::More;
 
-my $tests = 23;
+my $tests = 25;
 
 my %BUF_SIZE = (
    normal => 1024,
@@ -30,6 +31,11 @@ my $write_to_tmpfile = sub
     return $tmpfile;
 };
 
+{
+    my @test_files = glob('t/*.t');
+    runtests(@test_files);
+}
+
 plan tests => $tests;
 
 SKIP: {
@@ -42,7 +48,8 @@ SKIP: {
     my $program = tmpnam();
     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');
+    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');
 
     my $run_program_fail = sub
     {
@@ -64,6 +71,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');
@@ -71,8 +79,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');
@@ -136,9 +145,9 @@ SKIP: {
 
         my $switch = "--$type";
 
-        # Check that line chunks are merged when cleaning text
+        # Check that line chunks are printed when cleaning text without sequences
         my $short_text = 'Linux dev 2.6.32-5-openvz-686 #1 SMP Sun Sep 23 11:40:07 UTC 2012 i686 GNU/Linux';
-        is(qx(echo -n "$short_text" | $program_buf $switch), $short_text, "merge ${\length $short_text} bytes (BUF_SIZE=$BUF_SIZE{short}, $type)");
+        is(qx(echo -n "$short_text" | $program_buf $switch), $short_text, "print ${\length $short_text} bytes (BUF_SIZE=$BUF_SIZE{short}, $type)");
     };
 
     SKIP: {
@@ -169,6 +178,12 @@ SKIP: {
         like(qx(valgrind $program none/none $infile1 2>&1 >/dev/null), qr/no leaks are possible/, 'valgrind memleaks');
     }
 
+    {
+        my $debug = tmpnam();
+        is(system("gcc -DDEBUG -o $debug $source"), 0, 'debugging build');
+        unlink $debug if -e $debug;
+    }
+
     print <<'EOT';
 Colors
 ======