From 7aa4065dd1027676e3650b8ee8b6cc6a6f379115 Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Mon, 8 Nov 2021 08:47:30 +0100 Subject: [PATCH] Updated patches --- bin/test-drupal-project | 5 ++++- lib/stages/build.sh | 7 ++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/test-drupal-project b/bin/test-drupal-project index 6a4a59c..27e5d20 100755 --- a/bin/test-drupal-project +++ b/bin/test-drupal-project @@ -70,7 +70,6 @@ for i in "${@}"; do ;; -v | --verbose) export DRUPAL_TESTING_VERBOSE=true - set -o xtrace ;; -?*) printf "Unknown option: %s\n" "${i}" @@ -93,6 +92,10 @@ SCRIPT_DIR=$(get_script_dir) # shellcheck source=/dev/null source "${SCRIPT_DIR}/../configuration.sh" +if [ "${DRUPAL_TESTING_VERBOSE}" = true ] ; then + set -o xtrace +fi + for library in "${SCRIPT_DIR}"/../lib/*.sh; do # shellcheck source=/dev/null source "${library}" diff --git a/lib/stages/build.sh b/lib/stages/build.sh index 4e73af2..5601d19 100644 --- a/lib/stages/build.sh +++ b/lib/stages/build.sh @@ -35,11 +35,8 @@ _stage_build() { wget https://www.drupal.org/files/issues/2021-10-05/3240601%2B3240813-9.2.x.patch -O 3240601.patch patch -p1 < 3240601.patch - wget https://www.drupal.org/files/issues/2021-10-05/3192365-17-mkdir-race-condition-in-tests.patch - patch -p1 < 3192365-17-mkdir-race-condition-in-tests.patch - - wget https://www.drupal.org/files/issues/2021-11-02/3032275-71.patch - patch -p1 < 3032275-71.patch + wget https://www.drupal.org/files/issues/2021-11-03/3032275-78.patch + patch -p1 < 3032275-78.patch cd - || exit fi