r47731 - in /trunk/libtest-script-perl: Changes META.yml debian/changelog lib/Test/Script.pm t/03_compiles_bad.t t/05_runs_bad.t

[jawnsy-guest at users.alioth.debian.org]

Author: jawnsy-guest
Date: Tue Nov 24 15:27:58 2009
New Revision: 47731

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=47731
Log:
New upstream release

Modified:
    trunk/libtest-script-perl/Changes
    trunk/libtest-script-perl/META.yml
    trunk/libtest-script-perl/debian/changelog
    trunk/libtest-script-perl/lib/Test/Script.pm
    trunk/libtest-script-perl/t/03_compiles_bad.t
    trunk/libtest-script-perl/t/05_runs_bad.t

Modified: trunk/libtest-script-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-script-perl/Changes?rev=47731&op=diff
==============================================================================
--- trunk/libtest-script-perl/Changes (original)
+++ trunk/libtest-script-perl/Changes Tue Nov 24 15:27:58 2009
@@ -1,4 +1,7 @@
 Revision history for Perl extension Test-Script
+
+1.07 Tue 24 Nov 2009
+	- Second attempt at fixing the "Using" bug
 
 1.06 Wed 16 Sep 2009
 	- Update test to allow different die() return values

Modified: trunk/libtest-script-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-script-perl/META.yml?rev=47731&op=diff
==============================================================================
--- trunk/libtest-script-perl/META.yml (original)
+++ trunk/libtest-script-perl/META.yml Tue Nov 24 15:27:58 2009
@@ -31,4 +31,4 @@
   ChangeLog: http://fisheye2.atlassian.com/changelog/cpan/trunk/Test-Script
   license: http://dev.perl.org/licenses/
   repository: http://svn.ali.as/cpan/trunk/Test-Script
-version: 1.06
+version: 1.07

Modified: trunk/libtest-script-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-script-perl/debian/changelog?rev=47731&op=diff
==============================================================================
--- trunk/libtest-script-perl/debian/changelog (original)
+++ trunk/libtest-script-perl/debian/changelog Tue Nov 24 15:27:58 2009
@@ -1,3 +1,9 @@
+libtest-script-perl (1.07-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Yu <jawnsy at cpan.org>  Tue, 24 Nov 2009 06:46:42 -0500
+
 libtest-script-perl (1.06-1) unstable; urgency=low
 
   [ Jonathan Yu ]

Modified: trunk/libtest-script-perl/lib/Test/Script.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-script-perl/lib/Test/Script.pm?rev=47731&op=diff
==============================================================================
--- trunk/libtest-script-perl/lib/Test/Script.pm (original)
+++ trunk/libtest-script-perl/lib/Test/Script.pm Tue Nov 24 15:27:58 2009
@@ -42,7 +42,7 @@
 
 use vars qw{$VERSION @ISA @EXPORT};
 BEGIN {
-	$VERSION = '1.06';
+	$VERSION = '1.07';
 	@ISA     = 'Exporter';
 	@EXPORT  = qw{
 		script_compiles

Modified: trunk/libtest-script-perl/t/03_compiles_bad.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-script-perl/t/03_compiles_bad.t?rev=47731&op=diff
==============================================================================
--- trunk/libtest-script-perl/t/03_compiles_bad.t (original)
+++ trunk/libtest-script-perl/t/03_compiles_bad.t Tue Nov 24 15:27:58 2009
@@ -30,9 +30,8 @@
 SCOPE: {
 	# Run a test for a known-bad program
 	test_out("not ok 1 - Script t/bin/bad.pl compiles");
-	test_fail(+4);
-	test_err("/# Using.*?/") if $] < 5.008;
-	test_err("/# \\d+ - Bad at " . quotemeta($bad) . " line 4./");
+	test_fail(+3);
+	test_err("/# \\d+ - (?:Using.*\\n# )?Bad at " . quotemeta($bad) . " line 4./");
 	test_err("# BEGIN failed--compilation aborted at $bad line 5.");
 	my $rv = script_compiles('t/bin/bad.pl');
 	test_test('Bad script returns false');
@@ -42,9 +41,8 @@
 SCOPE: {
 	# Repeat with a custom message
 	test_out("not ok 1 - It worked");
-	test_fail(+4);
-	test_err("/# Using.*?/") if $] < 5.008;
-	test_err("/# \\d+ - Bad at " . quotemeta($bad) . " line 4./");
+	test_fail(+3);
+	test_err("/# \\d+ - (?:Using.*\\n# )?Bad at " . quotemeta($bad) . " line 4./");
 	test_err("# BEGIN failed--compilation aborted at $bad line 5.");
 	my $rv = script_compiles('t/bin/bad.pl', 'It worked');
 	test_test('Bad script returns false');

Modified: trunk/libtest-script-perl/t/05_runs_bad.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-script-perl/t/05_runs_bad.t?rev=47731&op=diff
==============================================================================
--- trunk/libtest-script-perl/t/05_runs_bad.t (original)
+++ trunk/libtest-script-perl/t/05_runs_bad.t Tue Nov 24 15:27:58 2009
@@ -27,7 +27,7 @@
 	# Run a test for a known-good program
 	test_out('not ok 1 - Script t/bin/four.pl runs');
 	test_fail(+2);
-	test_err('# 4 - Standard Error');
+	test_err('/^# 4 - (?:Using.*\n# )?Standard Error$/');
 	my $rv = script_runs('t/bin/four.pl');
 	test_test('Bad script returns false');
 	is( $rv, '', 'script_compiles_ok returns true as a convenience' );
@@ -37,7 +37,7 @@
 	# Repeat with a custom message
 	test_out('not ok 1 - It worked');
 	test_fail(+2);
-	test_err('# 4 - Standard Error');
+	test_err('/^# 4 - (?:Using.*\n# )?Standard Error$/');
 	my $rv = script_runs('t/bin/four.pl', 'It worked');
 	test_test('Bad script returns false');
 	is( $rv, '', 'script_compiles_ok returns true as a convenience' );