diff --git a/Makefile b/Makefile index b32bd70b..0f363387 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,7 @@ init: perl: perl-libs cpan @# workaround for broken pod coverage tests @#yes | $(SUDO) cpan --force XML::Validate - @#bash-tools/perl_cpanm_install_if_absent.sh setup/cpan-requirements.txt setup/cpan-requirements-packaged.txt + @#bash-tools/perl/perl_cpanm_install_if_absent.sh setup/cpan-requirements.txt setup/cpan-requirements-packaged.txt @: .PHONY: perl-libs @@ -94,7 +94,7 @@ test: lib-test .PHONY: basic-test basic-test: lib-test - . tests/excluded.sh; bash-tools/check_all.sh + . tests/excluded.sh; bash-tools/checks/check_all.sh tests/help.sh .PHONY: install diff --git a/tests/all.sh b/tests/all.sh index 133db766..74d47426 100755 --- a/tests/all.sh +++ b/tests/all.sh @@ -27,8 +27,8 @@ export PROJECT="devops-perl-tools" section "DevOps Perl Tools ALL Tests" -bash-tools/check_all.sh +bash-tools/checks/check_all.sh tests/help.sh -bash-tools/run_tests.sh +bash-tools/checks/run_tests.sh diff --git a/tests/test_nginx.sh b/tests/test_nginx.sh index aa6da1a5..7e56d695 100755 --- a/tests/test_nginx.sh +++ b/tests/test_nginx.sh @@ -22,7 +22,7 @@ cd "$srcdir2/.."; # shellcheck disable=SC1091 . ./tests/utils.sh -# because including bash-tools/util.sh resets the srcdir +# because including bash-tools/lib/utils.sh resets the srcdir srcdir="$srcdir2" section "N g i n x"