ci: Install seatd instead of manipulating PATH
This commit is contained in:
parent
66becee6da
commit
4091ba2c07
4 changed files with 4 additions and 2 deletions
|
@ -13,6 +13,7 @@ tasks:
|
||||||
meson -Dlibseat-seatd=enabled -Dlibseat-builtin=enabled -Dlibseat-logind=disabled -Dexamples=enabled build seatd
|
meson -Dlibseat-seatd=enabled -Dlibseat-builtin=enabled -Dlibseat-logind=disabled -Dexamples=enabled build seatd
|
||||||
- build: |
|
- build: |
|
||||||
ninja -C build
|
ninja -C build
|
||||||
|
sudo ninja -C build install
|
||||||
- unittest: |
|
- unittest: |
|
||||||
ninja -C build test
|
ninja -C build test
|
||||||
- scan-build: |
|
- scan-build: |
|
||||||
|
|
|
@ -12,6 +12,7 @@ tasks:
|
||||||
meson -Db_sanitize=address -Dlibseat-logind=auto -Dlibseat-seatd=enabled -Dlibseat-builtin=enabled -Dexamples=enabled build seatd
|
meson -Db_sanitize=address -Dlibseat-logind=auto -Dlibseat-seatd=enabled -Dlibseat-builtin=enabled -Dexamples=enabled build seatd
|
||||||
- build: |
|
- build: |
|
||||||
ninja -C build
|
ninja -C build
|
||||||
|
sudo ninja -C build install
|
||||||
- unittest: |
|
- unittest: |
|
||||||
ninja -C build test
|
ninja -C build test
|
||||||
- scan-build: |
|
- scan-build: |
|
||||||
|
|
|
@ -14,6 +14,7 @@ tasks:
|
||||||
rm -rf build
|
rm -rf build
|
||||||
meson -Db_lundef=false -Db_sanitize=address -Dlibseat-seatd=enabled -Dlibseat-builtin=enabled -Dexamples=enabled -Dlibseat-logind=disabled build seatd
|
meson -Db_lundef=false -Db_sanitize=address -Dlibseat-seatd=enabled -Dlibseat-builtin=enabled -Dexamples=enabled -Dlibseat-logind=disabled build seatd
|
||||||
ninja -C build
|
ninja -C build
|
||||||
|
sudo ninja -C build install
|
||||||
timeout -s KILL 30s ./seatd/.builds/smoketest-seatd.sh
|
timeout -s KILL 30s ./seatd/.builds/smoketest-seatd.sh
|
||||||
- smoketest-builtin: |
|
- smoketest-builtin: |
|
||||||
timeout -s KILL 30s ./seatd/.builds/smoketest-builtin.sh
|
timeout -s KILL 30s ./seatd/.builds/smoketest-builtin.sh
|
||||||
|
|
|
@ -13,7 +13,6 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export SEATD_LOGLEVEL=debug
|
export SEATD_LOGLEVEL=debug
|
||||||
export PATH=$(pwd)/build:$PATH
|
|
||||||
#
|
#
|
||||||
# Run simpletest a few times
|
# Run simpletest a few times
|
||||||
#
|
#
|
||||||
|
@ -21,7 +20,7 @@ cnt=0
|
||||||
while [ "$cnt" -lt 2 ]
|
while [ "$cnt" -lt 2 ]
|
||||||
do
|
do
|
||||||
echo "Simpletest run $((cnt+1))"
|
echo "Simpletest run $((cnt+1))"
|
||||||
if ! sudo -E seatd-launch ./build/simpletest $file
|
if ! sudo -E ./build/seatd-launch ./build/simpletest $file
|
||||||
then
|
then
|
||||||
echo "Simpletest failed"
|
echo "Simpletest failed"
|
||||||
exit 1
|
exit 1
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue