From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QBYIl-0001tO-Qm for garchives@archives.gentoo.org; Sun, 17 Apr 2011 20:10:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0DF661C050; Sun, 17 Apr 2011 20:10:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A697D1C050 for ; Sun, 17 Apr 2011 20:10:27 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3BA581B402A for ; Sun, 17 Apr 2011 20:10:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2FDF380072 for ; Sun, 17 Apr 2011 20:10:26 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <89dad5c2c602aa228d5bd1db720695dbe47d2fb3.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 00000_index.txt 15030_all_fix_perl_test_harness.patch X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 89dad5c2c602aa228d5bd1db720695dbe47d2fb3 Date: Sun, 17 Apr 2011 20:10:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 1e5772b99841e8529d1ee1dd2bd30854 commit: 89dad5c2c602aa228d5bd1db720695dbe47d2fb3 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Apr 17 20:10:17 2011 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Apr 17 20:10:17 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql-extras.= git;a=3Dcommit;h=3D89dad5c2 Add a fix for test-unit due to Perl Test::Harness changes. Signed-off-by: Robin H. Johnson gentoo.org> --- 00000_index.txt | 5 ++++ 15030_all_fix_perl_test_harness.patch | 35 +++++++++++++++++++++++++++= ++++++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/00000_index.txt b/00000_index.txt index 06335c3..1a8e59c 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -1331,3 +1331,8 @@ @ver 5.01.53.00 to 5.01.99.99 @pn mysql @@ Fix for the hardcoded /lib paths. + +@patch 15030_all_fix_perl_test_harness.patch +@ver 5.01.53.00 to 5.01.99.99 +@pn mysql +@@ Fix Test::Harness usage since the Perl class has changed and no longe= r execs by default. diff --git a/15030_all_fix_perl_test_harness.patch b/15030_all_fix_perl_t= est_harness.patch new file mode 100644 index 0000000..bd6d845 --- /dev/null +++ b/15030_all_fix_perl_test_harness.patch @@ -0,0 +1,35 @@ +Update Test::Harness usage for Test-Harness-3* + +Test-Harness-2 and older directly executed testcases that did not end in= .t. +In version 3, this is no longer the case, and Test::Harness is now a thi= n +wrapper around TAP::Harness. To make the testcases work again, we introd= uce a +subclass of TAP::Harness, that allows direct execution where needed. + +Signed-off-by: Robin H. Johnson + +--- mysql/unittest/unit.pl.orig 2011-04-17 18:12:47.104981268 +0000 ++++ mysql/unittest/unit.pl 2011-04-17 19:05:46.520096987 +0000 +@@ -93,7 +93,23 @@ + # Removing the first './' from the file names + foreach (@files) { s!^\./!! } + $ENV{'HARNESS_PERL_SWITCHES'} .=3D q" -e 'exec @ARGV'"; ++ $ENV{'HARNESS_SUBCLASS'} =3D qw(TAP::Harness::Exec); + runtests @files; + } + } +=20 ++package TAP::Harness::Exec; ++use base qw(TAP::Harness); ++sub new { ++ my ($class, $arg_for ) =3D @_; ++ $arg_for ||=3D {}; ++ $arg_for->{exec} =3D sub { ++ my ( $harness, $test_file ) =3D @_; ++ return undef if $test_file =3D~ /[.]t$/; ++ return [ $test_file ] if -x $test_file; ++ # This is a failure now ++ return undef; ++ }; ++ return $class->SUPER::new( $arg_for ); ++} ++1;