[ack] 05/05: Update sole patch for slightly different test suite

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch ack3
in repository ack.

commit 94632860b6e86517b817a4d1a570d70e5cf21fc5
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Wed Jan 3 03:27:45 2018 +0100

    Update sole patch for slightly different test suite
---
 debian/changelog                                   |  1 +
 .../no-standalone-test-but-autopkgtests.patch      | 54 ++++++++++++++--------
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c26d7a..d284784 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ack (2.999.01-1) UNRELEASED; urgency=medium
 
   * Import ack3 beta version 2.999.01.
+    + Update sole patch for slightly different test suite.
   * Update debian/upstream/metadata for ack3.
 
  -- Axel Beckert <abe at debian.org>  Wed, 03 Jan 2018 03:15:35 +0100
diff --git a/debian/patches/no-standalone-test-but-autopkgtests.patch b/debian/patches/no-standalone-test-but-autopkgtests.patch
index 66b8ad7..fa0f5c2 100644
--- a/debian/patches/no-standalone-test-but-autopkgtests.patch
+++ b/debian/patches/no-standalone-test-but-autopkgtests.patch
@@ -21,9 +21,9 @@ Last-Update: 2017-03-05
 
 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -123,12 +123,12 @@
- 	$(CP) $(ACK) ~/bin/ack2
- 	$(CP) ackrc ~/.ack2rc
+@@ -121,12 +121,12 @@
+ 	$(CP) $(ACK) ~/bin/ack3
+ 	$(CP) ackrc ~/.ack3rc
  
 -test: test_classic test_standalone
 +test: test_classic
@@ -47,7 +47,7 @@ Last-Update: 2017-03-05
  test_harness(shift, shift, shift);
 --- a/t/Util.pm
 +++ b/t/Util.pm
-@@ -175,8 +175,8 @@
+@@ -176,8 +176,8 @@
          unshift( @args, '--noenv' );
      }
  
@@ -58,7 +58,7 @@ Last-Update: 2017-03-05
      }
      else {
          unshift( @args, File::Spec->rel2abs( 'blib/script/ack', $orig_wd ) );
-@@ -404,7 +404,7 @@
+@@ -405,7 +405,7 @@
      my $perl = caret_X();
  
      @args = build_ack_invocation( @args );
@@ -67,7 +67,7 @@ Last-Update: 2017-03-05
          unshift( @args, $perl );
      }
      else {
-@@ -661,7 +661,7 @@
+@@ -676,7 +676,7 @@
  
                  my $perl = caret_X();
  
@@ -100,8 +100,8 @@ Last-Update: 2017-03-05
  }
 --- a/t/process-substitution.t
 +++ b/t/process-substitution.t
-@@ -51,7 +51,7 @@
-     # XXX doing this by hand here eq '=('
+@@ -50,7 +50,7 @@
+     my @args = build_ack_invocation( qw( --noenv --nocolor --smart-case this ) );
      my $perl = caret_X();
  
 -    if ( $ENV{'ACK_TEST_STANDALONE'} ) {
@@ -109,16 +109,34 @@ Last-Update: 2017-03-05
          unshift( @args, $perl );
      }
      else {
---- a/t/lib/00-coverage.t
-+++ b/t/lib/00-coverage.t
-@@ -11,6 +11,10 @@
+--- a/t/ack-man.t
++++ b/t/ack-man.t
+@@ -22,7 +22,7 @@
+ );
  
- use Test::More;
+ subtest 'ack --man' => sub {
+-    local $TODO = 'ack-standalone currently dumps all sections';
++    local $TODO = '/usr/bin/ack currently dumps all sections';
+     plan tests => 5;
  
-+unless ( $ENV{RELEASE_TESTING} ) {
-+    plan( skip_all => "these tests are for release candidate testing" );
-+}
-+
- my @pms = glob( '*.pm' );
+     my ($stdout, $stderr) = run_ack_with_stderr( '--man' );
+@@ -32,7 +32,7 @@
+ };
+ 
+ subtest 'ack --faq' => sub {
+-    local $TODO = 'ack-standalone currently dumps all sections';
++    local $TODO = '/usr/bin/ack currently dumps all sections';
+     plan tests => 5;
+ 
+     my ($stdout, $stderr) = run_ack_with_stderr( '--faq' );
+--- a/t/ack-match.t
++++ b/t/ack-match.t
+@@ -32,7 +32,7 @@
+     is_empty_array( $stdout, 'ack should return no STDOUT when piped into without a regex' );
+     cmp_ok( scalar @{$stderr}, '>', 0, 'Has to have at least one line of error message, but could have more under Appveyor' );
+ 
+-    my $name = $ENV{ACK_TEST_STANDALONE} ? 'ack-standalone' : 'ack';
++    my $name = $ENV{ACK_TEST_STANDALONE} ? '/usr/bin/ack' : 'ack';
+     is( $stderr->[0], "$name: No regular expression found.", 'Error message matches' );
+ };
  
- plan tests => scalar @pms;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/ack.git