Add a few more version tests

diff --git a/t/60-version.t b/t/60-version.t
index 68a99a0975dc2868070f527e987e22f82736cc66..9d7183d771211e787325be52637eeeb60cdb4863 100644 (file)
--- a/t/60-version.t
+++ b/t/60-version.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
 use strict;
 use warnings;
 

-use Test::More tests => 6 + 5 + 4 * 8 + 2 * 21 + 2 * 14;
+use Test::More tests => 6 + 5 + 4 * 9 + 2 * 23 + 2 * 14;

 
 use Test::Valgrind::Version;
 
 
 use Test::Valgrind::Version;
 


@@ -53,14 +53,15 @@ for my $failure (@string_failures) {
 }
 
 my @command_valid = (
 }
 
 my @command_valid = (

- 'valgrind-1'         => '1.0.0',
- 'valgrind-1.2'       => '1.2.0',
- 'valgrind-1.2.3'     => '1.2.3',
- 'valgrind-1.2.4-rc5' => '1.2.4',
- 'valgrind-1.2.6a'    => '1.2.6',
- 'valgrind-1.2.7.'    => '1.2.7',
- 'valgrind-1.2.x.8'   => '1.2.0',
- 'valgrind-1.10.'     => '1.10.0',
+ 'valgrind-1'          => '1.0.0',
+ 'valgrind-1.2'        => '1.2.0',
+ 'valgrind-1.2.3'      => '1.2.3',
+ 'valgrind-1.2.4-rc5'  => '1.2.4',
+ 'valgrind-1.2.6a'     => '1.2.6',
+ 'valgrind-1.2.7.'     => '1.2.7',
+ 'valgrind-1.2.x.8'    => '1.2.0',
+ 'valgrind-1.10.'      => '1.10.0',
+ 'valgrind-3.12.0.SVN' => '3.12.0',

 );
 
 my @string_valid = map { my $s = $_; $s =~ s/^valgrind-//; $s }
 );
 
 my @string_valid = map { my $s = $_; $s =~ s/^valgrind-//; $s }


@@ -91,27 +92,29 @@ sub tvv_s {
 }
 
 my @compare = (
 }
 
 my @compare = (

- '1',       '1',     0,
- '1',       '1.0',   0,
- '1',       '1.0.0', 0,
- '1.1',     '1',     1,
- '1.1',     '1.0',   1,
- '1.1',     '1.0.0', 1,
- '1',       '1.1',   -1,
- '1.0',     '1.1',   -1,
- '1.0.0',   '1.1',   -1,
- '1.1',     '1.2',   -1,
- '1.1.0',   '1.2',   -1,
- '1.1',     '1.2.0', -1,
- '1.1.0',   '1.2.0', -1,
- '1',       '1',     0,
- '1.0.1',   '1',     1,
- '1.0.1.0', '1',     1,
- '1.0.0.1', '1',     1,
- '1.0.0.1', '1.0.1', -1,
- '1.0.0.2', '1.0.1', -1,
- '3.4.0',   '3.4.1', -1,
- '3.5.2',   '3.5.1', 1,
+ '1',       '1',      0,
+ '1',       '1.0',    0,
+ '1',       '1.0.0',  0,
+ '1.1',     '1',      1,
+ '1.1',     '1.0',    1,
+ '1.1',     '1.0.0',  1,
+ '1',       '1.1',    -1,
+ '1.0',     '1.1',    -1,
+ '1.0.0',   '1.1',    -1,
+ '1.1',     '1.2',    -1,
+ '1.1.0',   '1.2',    -1,
+ '1.1',     '1.2.0',  -1,
+ '1.1.0',   '1.2.0',  -1,
+ '1',       '1',      0,
+ '1.0.1',   '1',      1,
+ '1.0.1.0', '1',      1,
+ '1.0.0.1', '1',      1,
+ '1.0.0.1', '1.0.1',  -1,
+ '1.0.0.2', '1.0.1',  -1,
+ '3.4.0',   '3.4.1',  -1,
+ '3.5.2',   '3.5.1',  1,
+ '3.12.0',  '3.1.0',  1,
+ '3.1.0',   '3.12.0', -1,

 );
 
 while (@compare) {
 );
 
 while (@compare) {