Catch test file exceptions

[colorize.git] / test.pl

diff --git a/test.pl b/test.pl
index 8d8b592895def338f13a8723414f8aaa5d9e2b8f..776b8a2d96a8bb01e7ebca4d41fe486e3e61426c 100755 (executable)
--- a/test.pl
+++ b/test.pl
@@ -8,9 +8,10 @@ use constant false => 0;
 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');
+    eval { runtests(@test_files) } or warn $@;
+}
+
 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
     {
@@ -138,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: {
@@ -171,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
 ======