Run tests through valgrind

3 files changed, 41 insertions, 22 deletions

diff --git a/Makefile b/Makefile
index da60da2..2c111eb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: check clean release
+.PHONY: check check_valgrind clean release
 
 .SUFFIXES:
 .SUFFIXES: .c .o
@@ -13,7 +13,11 @@ colorize:	colorize.c
 			$(CC) $(CFLAGS) -o colorize colorize.c -DCFLAGS="$(CFLAGS)" -DHAVE_VERSION $(FLAGS)
 
 check:
-			perl ./test.pl
+			perl ./test.pl --regular
+
+check_valgrind:
+			@which valgrind >/dev/null 2>&1 || (printf '%s\n' "valgrind not found" && exit 1)
+			perl ./test.pl --valgrind || exit 0
 
 clean:
 			rm -f a.out colorize debug.txt version.h
diff --git a/lib/Colorize/Common.pm b/lib/Colorize/Common.pm
index e61450b..a60dbe9 100644
--- a/lib/Colorize/Common.pm
+++ b/lib/Colorize/Common.pm
@@ -11,10 +11,10 @@ our (@EXPORT_OK, %EXPORT_TAGS);
 my @defaults;
 
 @defaults    = qw($source $compiler);
-@EXPORT_OK   = (qw($compiler_flags %BUF_SIZE $write_to_tmpfile), @defaults);
+@EXPORT_OK   = (qw($compiler_flags %BUF_SIZE $valgrind_command $write_to_tmpfile), @defaults);
 %EXPORT_TAGS = ('defaults' => [ @defaults ]);
 
-our ($source, $compiler, $compiler_flags, %BUF_SIZE, $write_to_tmpfile);
+our ($source, $compiler, $compiler_flags, %BUF_SIZE, $valgrind_command, $write_to_tmpfile);
 
 #---------------#
 # START of data #
@@ -27,6 +27,7 @@ $compiler_flags = '-ansi -pedantic -Wall -Wextra -Wformat -Wswitch-default -Wuni
     normal => 1024,
     short  => 10,
 );
+$valgrind_command = 'valgrind';
 $write_to_tmpfile = sub
 {
     my ($content) = @_;
diff --git a/test.pl b/test.pl
index 476cb7a..a44395f 100755
--- a/test.pl
+++ b/test.pl
@@ -6,13 +6,27 @@ use lib qw(lib);
 use constant true  => 1;
 use constant false => 0;
 
-use Colorize::Common qw(:defaults $compiler_flags %BUF_SIZE $write_to_tmpfile);
+use Colorize::Common qw(:defaults $compiler_flags %BUF_SIZE $valgrind_command $write_to_tmpfile);
 use File::Temp qw(tmpnam);
+use Getopt::Long qw(:config no_auto_abbrev no_ignore_case);
 use Test::Harness qw(runtests);
 use Test::More;
 
 my $tests = 24;
 
+my $valgrind_cmd = '';
+{
+    my ($regular, $valgrind);
+    GetOptions(regular => \$regular, valgrind => \$valgrind) or exit;
+    if (not $regular || $valgrind) {
+        die "$0: neither --regular nor --valgrind specified, exiting\n";
+    }
+    elsif ($regular && $valgrind) {
+        die "$0: both --regular and --valgrind specified, exiting\n";
+    }
+    $valgrind_cmd = "$valgrind_command " if $valgrind;
+}
+
 {
     my @test_files = glob('t/*.t');
     eval { runtests(@test_files) } or warn $@;
@@ -30,18 +44,18 @@ SKIP: {
     my $program = tmpnam();
     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');
+    is(system("$valgrind_cmd$program --help >/dev/null"),    0, 'exit value for help screen');
+    is(system("$valgrind_cmd$program --version >/dev/null"), 0, 'exit value for version data');
 
-    is(qx(printf '%s\n' "hello world" | $program none/none), "hello world\n", 'line read from stdin with newline');
-    is(qx(printf  %s    "hello world" | $program none/none), "hello world",   'line read from stdin without newline');
+    is(qx(printf '%s\n' "hello world" | $valgrind_cmd$program none/none), "hello world\n", 'line read from stdin with newline');
+    is(qx(printf  %s    "hello world" | $valgrind_cmd$program none/none), "hello world",   'line read from stdin without newline');
 
     my $text = do { local $/; <DATA> };
 
     my $infile1 = $write_to_tmpfile->($text);
 
-    is_deeply([split /\n/, qx(cat $infile1 | $program none/none)], [split /\n/, $text], 'text read from stdin');
-    is_deeply([split /\n/, qx($program none/none $infile1)],       [split /\n/, $text], 'text read from file');
+    is_deeply([split /\n/, qx(cat $infile1 | $valgrind_cmd$program none/none)], [split /\n/, $text], 'text read from stdin');
+    is_deeply([split /\n/, qx($valgrind_cmd$program none/none $infile1)],       [split /\n/, $text], 'text read from file');
 
     {
         my @fg_colors = (30..37, 39);
@@ -53,7 +67,7 @@ SKIP: {
 
         my $ok = true;
         foreach my $value (@values) {
-            $ok &= qx(printf %s "\e[${value}m" | $program --clean) eq '';
+            $ok &= qx(printf %s "\e[${value}m" | $valgrind_cmd$program --clean) eq '';
         }
         ok($ok, 'clean color sequences');
     }
@@ -64,16 +78,16 @@ SKIP: {
 
         my $switch = "--$type";
 
-        is(qx(printf %s "\e[35mhello\e[0m \e[36mworld\e[0m" | $program $switch),     'hello world', "$type colored words");
-        is(qx(printf %s "hello world" | $program Magenta | $program $switch),        'hello world', "$type colored line");
-        is_deeply([split /\n/, qx($program cyan $infile1 | $program $switch)], [split /\n/, $text], "$type colored text");
+        is(qx(printf %s "\e[35mhello\e[0m \e[36mworld\e[0m" | $valgrind_cmd$program $switch),     'hello world', "$type colored words");
+        is(qx(printf %s "hello world" | $program Magenta | $valgrind_cmd$program $switch),        'hello world', "$type colored line");
+        is_deeply([split /\n/, qx($program cyan $infile1 | $valgrind_cmd$program $switch)], [split /\n/, $text], "$type colored text");
 
-        ok(qx(printf %s "\e[\e[33m" | $program $switch) eq "\e[", "$type with invalid sequence");
+        ok(qx(printf %s "\e[\e[33m" | $valgrind_cmd$program $switch) eq "\e[", "$type with invalid sequence");
     };
 
     $check_clean->($_) foreach qw(clean clean-all);
 
-    is(qx(printf %s "\e[4munderline\e[24m" | $program --clean-all), 'underline', 'clean-all color sequences');
+    is(qx(printf %s "\e[4munderline\e[24m" | $valgrind_cmd$program --clean-all), 'underline', 'clean-all color sequences');
 
     my $check_clean_buf = sub
     {
@@ -83,7 +97,7 @@ SKIP: {
 
         # 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(printf %s "$short_text" | $program_buf $switch), $short_text, "print ${\length $short_text} bytes (BUF_SIZE=$BUF_SIZE{short}, $type)");
+        is(qx(printf %s "$short_text" | $valgrind_cmd$program_buf $switch), $short_text, "print ${\length $short_text} bytes (BUF_SIZE=$BUF_SIZE{short}, $type)");
     };
 
     SKIP: {
@@ -96,18 +110,18 @@ SKIP: {
     my $repeated = join "\n", ($text) x 7;
     my $infile2  = $write_to_tmpfile->($repeated);
 
-    is_deeply([split /\n/, qx(cat $infile2 | $program none/none)], [split /\n/, $repeated], "read ${\length $repeated} bytes (BUF_SIZE=$BUF_SIZE{normal})");
+    is_deeply([split /\n/, qx(cat $infile2 | $valgrind_cmd$program none/none)], [split /\n/, $repeated], "read ${\length $repeated} bytes (BUF_SIZE=$BUF_SIZE{normal})");
 
     {
-        my $colored_text = qx(printf '%s\n' "foo bar baz" | $program red);
+        my $colored_text = qx(printf '%s\n' "foo bar baz" | $valgrind_cmd$program red);
         my $sequences = 0;
         $sequences++ while $colored_text =~ /\e\[\d+m/g;
         is($sequences, 2, 'count of sequences printed');
     }
 
-    is(qx(printf %s "hello\nworld\r\n" | $program none/none), "hello\nworld\r\n", 'stream mode');
+    is(qx(printf %s "hello\nworld\r\n" | $valgrind_cmd$program none/none), "hello\nworld\r\n", 'stream mode');
 
-    is(system(qq(printf '%s\n' "hello world" | $program random --exclude-random=black >/dev/null 2>&1)), 0, 'switch exclude-random');
+    is(system(qq(printf '%s\n' "hello world" | $valgrind_cmd$program random --exclude-random=black >/dev/null)), 0, 'switch exclude-random');
 
     SKIP: {
         skip 'valgrind not found', 1 unless system('which valgrind >/dev/null 2>&1') == 0;