Dpkg::BuildOptions: Add tests and fix errors found

This whole module was one giant brown paper bag bug...

diff --git a/ChangeLog b/ChangeLog
index 09eeaed86883d54a569d0ab6dd865335f41e0f3a..afd178c1c45ab4f10ba9d56aed27559166f2e636 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 2007-10-12  Frank Lichtenheld  <djpig@debian.org>
 
+       * scripts/t/300_Dpkg_BuildOptions.t: New file.
+       Leads to the following fixes:
        * scripts/Dpkg/BuildOptions.pm (parse): Add
-       support for nocheck.
+       support for nocheck and make it actually work.
        (set): Really set DEB_BUILD_OPTIONS. Discovered
        by Daniel Shepler.
 

diff --git a/scripts/Dpkg/BuildOptions.pm b/scripts/Dpkg/BuildOptions.pm
index d94a0d362c525c6baa1dcbc52027c42d6b173714..8be98ffa2f98e87080c2d75717885fef878bb684 100644 (file)
--- a/scripts/Dpkg/BuildOptions.pm
+++ b/scripts/Dpkg/BuildOptions.pm
@@ -11,9 +11,10 @@ sub parse {
     unless ($env) { return {}; }
 
     my %opts;
-    if ($env =~ s/(noopt|nostrip|nocheck),?//ig) {
+    while ($env =~ s/(noopt|nostrip|nocheck),?//i) {
        $opts{lc $1} = '';
-    } elsif ($env =~ s/(parallel)=(-?\d+),?//ig) {
+    }
+    while ($env =~ s/(parallel)=(-?\d+),?//i) {
        $opts{lc $1} = $2;
     }
 
@@ -35,6 +36,7 @@ sub set {
     }
 
     $ENV{DEB_BUILD_OPTIONS} = $env if $env;
+    return $env;
 }
 
 1;

diff --git a/scripts/t/300_Dpkg_BuildOptions.t b/scripts/t/300_Dpkg_BuildOptions.t
new file mode 100644 (file)
index 0000000..bfd788f
--- /dev/null
+++ b/scripts/t/300_Dpkg_BuildOptions.t
@@ -0,0 +1,41 @@
+# -*- mode: cperl;-*-
+
+use Test::More tests => 6;
+
+use strict;
+use warnings;
+
+use_ok('Dpkg::BuildOptions');
+
+$ENV{DEB_BUILD_OPTIONS} = 'foonostripbar,parallel=3,bazNOCHECK';
+
+my $dbo = Dpkg::BuildOptions::parse();
+
+my %dbo = (
+          nostrip => '',
+          nocheck => '',
+          parallel => 3,
+          );
+my %dbo2 = (
+           nocheck => '',
+          );
+
+
+is_deeply($dbo, \%dbo, 'parse');
+
+$dbo = Dpkg::BuildOptions::parse('no opt,no-strip,parallel = 5,nocheck');
+
+is_deeply($dbo, \%dbo2, 'parse (param)');
+
+$dbo->{parallel} = 5;
+$dbo->{noopt} = '';
+
+my $env = Dpkg::BuildOptions::set($dbo,1);
+
+is($ENV{DEB_BUILD_OPTIONS}, $env, 'set (return value)');
+is_deeply(Dpkg::BuildOptions::parse(), $dbo, 'set (env)');
+
+$ENV{DEB_BUILD_OPTIONS} = 'foobar';
+$dbo = { noopt => '' };
+$env = Dpkg::BuildOptions::set($dbo);
+is($env, "foobar,noopt,", 'set (append)');