This is an automated email from the git hooks/post-receive script. abe pushed a commit to branch master in repository ack.
commit 36150a69d1c5dd06eae8cadba685715d31648960 Author: Axel Beckert <a...@deuxchevaux.org> Date: Sun Mar 5 20:48:01 2017 +0100 no-standalone-test-but-autopkgtests.patch: s/ADTTMP/AUTOPKGTEST_TMP/g --- debian/changelog | 2 ++ .../no-standalone-test-but-autopkgtests.patch | 27 +++++++++++----------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index a34d35d..7667c94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ ack (2.15.03-1) UNRELEASED; urgency=medium * Re-enable running test suite at build time. * Add t/ directory to debian/tests/pkg-perl/smoke-files to actually run the run-time tests during autopkgtest. + * Update no-standalone-test-but-autopkgtests.patch to use + $AUTOPKGTEST_TMP instead of $ADTTMP. -- Axel Beckert <a...@debian.org> Sun, 05 Mar 2017 19:29:30 +0100 diff --git a/debian/patches/no-standalone-test-but-autopkgtests.patch b/debian/patches/no-standalone-test-but-autopkgtests.patch index d2ff86a..589c940 100644 --- a/debian/patches/no-standalone-test-but-autopkgtests.patch +++ b/debian/patches/no-standalone-test-but-autopkgtests.patch @@ -6,17 +6,18 @@ Description: Misuse $ACK_TEST_STANDALONE to switch between build-/installed-time infrastructure. . So we change (nearly) all occurrences of the ACK_TEST_STANDALONE - environment variable of ack's test suite to ADTTMP and switch between - build-time and installed-time testing with it. Which fits perfectly - because -Mblib is usually not used or unset if + environment variable of ack's test suite to AUTOPKGTEST_TMP and + switch between build-time and installed-time testing with it. Which + fits perfectly because -Mblib is usually not used or unset if $ENV{ACK_TEST_STANDALONE} is set. . - So we skip the test_standalone target, but pass $ADTTMP instead of a - hardcoded 0 to t/runtests.pl to trigger the switch. That way it - should even work when running "make test" after "perl Makefile.PL" - has run. + So we skip the test_standalone target, but pass $AUTOPKGTEST_TMP + instead of a hardcoded 0 to t/runtests.pl to trigger the switch. That + way it should even work when running "make test" after "perl + Makefile.PL" has run. Author: Axel Beckert <a...@debian.org> Forwarded: not-needed +Last-Update: 2017-03-05 --- a/Makefile.PL +++ b/Makefile.PL @@ -31,7 +32,7 @@ Forwarded: not-needed test_classic: all - $(FULLPERLRUN) t/runtests.pl 0 $(TEST_VERBOSE) "$(INST_LIB)" "$(INST_ARCHLIB)" $(TEST_FILES) -+ $(FULLPERLRUN) t/runtests.pl "$(ADTTMP)" $(TEST_VERBOSE) "$(INST_LIB)" "$(INST_ARCHLIB)" $(TEST_FILES) ++ $(FULLPERLRUN) t/runtests.pl "$(AUTOPKGTEST_TMP)" $(TEST_VERBOSE) "$(INST_LIB)" "$(INST_ARCHLIB)" $(TEST_FILES) test_standalone: all ack-standalone $(FULLPERLRUN) t/runtests.pl 1 $(TEST_VERBOSE) "$(INST_LIB)" "$(INST_ARCHLIB)" $(TEST_FILES) @@ -52,7 +53,7 @@ Forwarded: not-needed - if ( $ENV{'ACK_TEST_STANDALONE'} ) { - unshift( @args, File::Spec->rel2abs( 'ack-standalone', $orig_wd ) ); -+ if ( $ENV{'ADTTMP'} ) { ++ if ( $ENV{'AUTOPKGTEST_TMP'} ) { + unshift( @args, File::Spec->rel2abs( '/usr/bin/ack', $orig_wd ) ); } else { @@ -62,7 +63,7 @@ Forwarded: not-needed @args = build_ack_invocation( @args ); - if ( $ENV{'ACK_TEST_STANDALONE'} ) { -+ if ( $ENV{'ADTTMP'} ) { ++ if ( $ENV{'AUTOPKGTEST_TMP'} ) { unshift( @args, $perl ); } else { @@ -71,7 +72,7 @@ Forwarded: not-needed my $perl = caret_X(); - if ( $ENV{'ACK_TEST_STANDALONE'} ) { -+ if ( $ENV{'ADTTMP'} ) { ++ if ( $ENV{'AUTOPKGTEST_TMP'} ) { unshift( @cmd, $perl ); } else { @@ -93,7 +94,7 @@ Forwarded: not-needed my @rhs_args = ( $perl, '-Mblib', build_ack_invocation( '-x', 'the' ) ); # for now -if ( $ENV{'ACK_TEST_STANDALONE'} ) { -+if ( $ENV{'ADTTMP'} ) { ++if ( $ENV{'AUTOPKGTEST_TMP'} ) { @lhs_args = grep { $_ ne '-Mblib' } @lhs_args; @rhs_args = grep { $_ ne '-Mblib' } @rhs_args; } @@ -104,7 +105,7 @@ Forwarded: not-needed my $perl = caret_X(); - if ( $ENV{'ACK_TEST_STANDALONE'} ) { -+ if ( $ENV{'ADTTMP'} ) { ++ if ( $ENV{'AUTOPKGTEST_TMP'} ) { unshift( @args, $perl ); } else { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/ack.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits