From f0d1c1b8ecdd440bce3e76a139ac408642d8306c Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 26 Sep 2023 10:27:57 +0200 Subject: [PATCH] Bug 34911: Test files from HEAD instead of 'master' Content-Type: text/plain; charset=utf-8 Since bug 34303 the test suite (when ran on jenkins) is no longer testing Perl::Critic koha_1 | fatal: Not a valid object name master koha_1 | [14:58:14] t/00-testcritic.t We are not cloning the whole repo and "master" is not available. Additionally we do not want to test master's files on stable branches anyway... Signed-off-by: Marcel de Rooy --- t/00-testcritic.t | 2 +- xt/check_makefile.t | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/t/00-testcritic.t b/t/00-testcritic.t index debd8b2f18..66458df707 100755 --- a/t/00-testcritic.t +++ b/t/00-testcritic.t @@ -14,5 +14,5 @@ if ( $EVAL_ERROR ) { } Test::Perl::Critic->import( -profile => '.perlcriticrc' ); -my @files = map { chomp; $_ } `git ls-tree -r master --name-only`; # only files part of git +my @files = map { chomp; $_ } `git ls-tree -r HEAD --name-only`; # only files part of git all_critic_ok(@files); diff --git a/xt/check_makefile.t b/xt/check_makefile.t index 69b0f24891..91235bfa14 100755 --- a/xt/check_makefile.t +++ b/xt/check_makefile.t @@ -26,7 +26,7 @@ use File::Slurp qw( read_file ); use Data::Dumper; my $curdir = File::Spec->curdir(); -my @dirs = `git ls-tree -d --name-only master`; +my @dirs = `git ls-tree -d --name-only HEAD`; my $makefile = read_file("$curdir/Makefile.PL"); my @missing; for my $d ( sort @dirs ) { -- 2.30.2