Skip to content

Commit 4322e7e

Browse files
committed
tools: Disable tests when using tasks and some minor cleanup
1 parent 1dd7c0d commit 4322e7e

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

tools/build_on_steamos_device_local.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ source "$(dirname "$0")/steamos_common_local.sh" "$@"
77
pushd ..
88

99
echo "Setting up build..."
10-
meson setup build.local --prefix=/usr
10+
meson setup build.local --prefix=/usr -Denable_tests=false
1111

1212
echo "Building gamescope..."
1313
meson compile -C build.local

tools/steamos_password_helpers.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ set -euo pipefail
44

55
envsudo() {
66
if [[ -n "${STEAMOS_USER_PASSWORD:-}" ]]; then
7-
echo "$STEAMOS_USER_PASSWORD" | sudo -S "$@"
7+
echo "$STEAMOS_USER_PASSWORD" | sudo -S 2>/dev/null "$@"
88
else
99
sudo "$@"
1010
fi
1111
}
1212

1313
envsshpass() {
1414
if [[ -n "${STEAMOS_USER_PASSWORD:-}" ]]; then
15-
sshpass -p "$STEAMOS_USER_PASSWORD" "$@"
15+
sshpass -p "$STEAMOS_USER_PASSWORD" -- "$@"
1616
else
1717
sudo "$@"
1818
fi

0 commit comments

Comments
 (0)