From d6af73ba68bb6d51cf3e6712a3d43ff0c79a377c Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 6 Mar 2023 10:32:55 +0000 Subject: [PATCH] tests: Use a more interoperable path to bash On systems that have undergone the /usr merge, /bin/bash and /usr/bin/bash can be used interchangeably, but on systems where /bin and /usr/bin are separate (such as Debian 11 or older), bash was traditionally in /bin and there is no bash in /usr/bin. Resolves: https://gitlab.gnome.org/GNOME/mutter/-/issues/2385 Signed-off-by: Simon McVittie Part-of: --- .gitlab-ci/checkout-gnome-shell.sh | 2 +- .gitlab-ci/download-coverity-tarball.sh | 2 +- src/tests/kvm/run-kvm-test.sh | 2 +- src/tests/kvm/virtme-run.sh | 2 +- src/tests/x11-test.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/checkout-gnome-shell.sh b/.gitlab-ci/checkout-gnome-shell.sh index e4bb9c45c..4e086da48 100755 --- a/.gitlab-ci/checkout-gnome-shell.sh +++ b/.gitlab-ci/checkout-gnome-shell.sh @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/bin/bash fetch() { local remote=$1 diff --git a/.gitlab-ci/download-coverity-tarball.sh b/.gitlab-ci/download-coverity-tarball.sh index ca875c940..182363ccf 100755 --- a/.gitlab-ci/download-coverity-tarball.sh +++ b/.gitlab-ci/download-coverity-tarball.sh @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/bin/bash # We need a coverity token to fetch the tarball if [ -x $COVERITY_TOKEN ] diff --git a/src/tests/kvm/run-kvm-test.sh b/src/tests/kvm/run-kvm-test.sh index ff94a6843..4213ef9e8 100755 --- a/src/tests/kvm/run-kvm-test.sh +++ b/src/tests/kvm/run-kvm-test.sh @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/bin/bash set -e diff --git a/src/tests/kvm/virtme-run.sh b/src/tests/kvm/virtme-run.sh index 836b38353..d07965494 100755 --- a/src/tests/kvm/virtme-run.sh +++ b/src/tests/kvm/virtme-run.sh @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/bin/bash set -e diff --git a/src/tests/x11-test.sh b/src/tests/x11-test.sh index 376a01961..59e460fc3 100755 --- a/src/tests/x11-test.sh +++ b/src/tests/x11-test.sh @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/bin/bash set -e