From: <de...@de...> - 2012-11-30 06:27:26
|
Author: PeterThoeny Date: 2012-11-30 00:27:20 -0600 (Fri, 30 Nov 2012) New Revision: 24242 Trac url: http://develop.twiki.org/trac/changeset/24242 Modified: twiki/branches/TWikiRelease05x01/UnitTestContrib/test/unit/ConfigureTests.pm Log: Item7067: Fix for configure adding extra (?^: ... ) to regex variables on save under Perl 5.14 - updating unit test Modified: twiki/branches/TWikiRelease05x01/UnitTestContrib/test/unit/ConfigureTests.pm =================================================================== --- twiki/branches/TWikiRelease05x01/UnitTestContrib/test/unit/ConfigureTests.pm 2012-11-30 06:27:05 UTC (rev 24241) +++ twiki/branches/TWikiRelease05x01/UnitTestContrib/test/unit/ConfigureTests.pm 2012-11-30 06:27:20 UTC (rev 24242) @@ -70,15 +70,17 @@ $cfg{MandatoryBoolean} = 0; $cfg{Types}{Chosen} = 'TWiki::Configure::Types::STRING'; $cfg{OptionalRegex} = qr/^X*$/; + my $aRegex = "qr/$cfg{OptionalRegex}/"; + $aRegex = '\'^X*$\'' if( $^V lt v5.14.0 ); $cfg{DontIgnore} = 'now is'; $saver->{content} = ''; $out = $saver->_save(); - my $expectacle = <<'EXAMPLE'; -$TWiki::cfg{MandatoryBoolean} = 0; -$TWiki::cfg{MandatoryPath} = 'fixed'; -$TWiki::cfg{OptionalRegex} = '^X*$'; -$TWiki::cfg{DontIgnore} = 'now is'; -$TWiki::cfg{Types}{Chosen} = 'TWiki::Configure::Types::STRING'; + my $expectacle = <<"EXAMPLE"; +\$TWiki::cfg{MandatoryBoolean} = 0; +\$TWiki::cfg{MandatoryPath} = 'fixed'; +\$TWiki::cfg{OptionalRegex} = $aRegex; +\$TWiki::cfg{DontIgnore} = 'now is'; +\$TWiki::cfg{Types}{Chosen} = 'TWiki::Configure::Types::STRING'; 1; EXAMPLE my @a = split("\n", $expectacle); |