Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

guess the xorg path in tests #308

Merged
merged 4 commits into from
Apr 23, 2024
Merged

guess the xorg path in tests #308

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d89a31f
On Arch Linux, `Xorg` is located at `/usr/lib/Xorg`
jat001 Apr 23, 2024
ab48e0e
guess xorg path
jat001 Apr 23, 2024
c19d876
stick with sh
jat001 Apr 23, 2024
d0ec07d
Refactor Xorg path detection into FindXorg function in xorg-test-run.sh
jat001 Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions tests/xorg-test-run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,30 @@

# Test that Xorg can load the compiled modules

FindXorg()
{
set -- \
/usr/local/libexec/Xorg \
/usr/libexec/Xorg \
/usr/lib/xorg/Xorg \
/usr/lib/Xorg \
/usr/bin/Xorg

for path in "$@"; do
if [ -x "$path" ]; then
echo "$path"
exit
fi
done

if [ -z "$XORG" ]; then
echo 'Xorg'
fi
}

# X server to run
if [ -z "$XORG" ]; then
if [ -x /usr/lib/xorg/Xorg ]; then
# Don't use the Ubuntu wrapped server
XORG=/usr/lib/xorg/Xorg
else
XORG=Xorg
fi
XORG=`FindXorg`
fi

# Client to connect to Xorg
Expand Down