ci/bare-metal: Reword the final output of the init script on the board.
I'm going to be adding tracie, which isn't deqp. Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5393>
This commit is contained in:
parent
7ef648c0f3
commit
a13209bdec
|
@ -76,7 +76,7 @@ $BM/expect-output.sh serial-output.txt -f "load_archive: loading locale_en.bin"
|
||||||
$BM/write-serial.py $BM_SERIAL `printf '\016'`
|
$BM/write-serial.py $BM_SERIAL `printf '\016'`
|
||||||
|
|
||||||
# Wait for the device to complete the deqp run
|
# Wait for the device to complete the deqp run
|
||||||
$BM/expect-output.sh serial-output.txt -f "DEQP RESULT"
|
$BM/expect-output.sh serial-output.txt -f "bare-metal result"
|
||||||
|
|
||||||
# power down the CPU on the device
|
# power down the CPU on the device
|
||||||
$BM/write-serial.py $BM_SERIAL_EC 'power off'
|
$BM/write-serial.py $BM_SERIAL_EC 'power off'
|
||||||
|
@ -90,7 +90,7 @@ mkdir -p results
|
||||||
cp -Rp /nfs/results/. results/
|
cp -Rp /nfs/results/. results/
|
||||||
|
|
||||||
set +e
|
set +e
|
||||||
if grep -q "DEQP RESULT: pass" serial-output.txt; then
|
if grep -q "bare-metal result: pass" serial-output.txt; then
|
||||||
exit 0
|
exit 0
|
||||||
else
|
else
|
||||||
exit 1
|
exit 1
|
||||||
|
|
|
@ -92,13 +92,13 @@ $BM/expect-output.sh artifacts/serial-output.txt \
|
||||||
fastboot boot -s $BM_FASTBOOT_SERIAL artifacts/fastboot.img
|
fastboot boot -s $BM_FASTBOOT_SERIAL artifacts/fastboot.img
|
||||||
|
|
||||||
# Wait for the device to complete the deqp run
|
# Wait for the device to complete the deqp run
|
||||||
$BM/expect-output.sh artifacts/serial-output.txt -f "DEQP RESULT"
|
$BM/expect-output.sh artifacts/serial-output.txt -f "bare-metal result"
|
||||||
|
|
||||||
# power down the device
|
# power down the device
|
||||||
PATH=$BM:$PATH $BM_POWERDOWN
|
PATH=$BM:$PATH $BM_POWERDOWN
|
||||||
|
|
||||||
set +e
|
set +e
|
||||||
if grep -q "DEQP RESULT: pass" artifacts/serial-output.txt; then
|
if grep -q "bare-metal result: pass" artifacts/serial-output.txt; then
|
||||||
exit 0
|
exit 0
|
||||||
else
|
else
|
||||||
exit 1
|
exit 1
|
||||||
|
|
|
@ -18,9 +18,9 @@ if [ -e /install/deqp-expected-fails.txt ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if sh /deqp/deqp-runner.sh; then
|
if sh /deqp/deqp-runner.sh; then
|
||||||
echo "DEQP RESULT: pass"
|
echo "bare-metal result: pass"
|
||||||
else
|
else
|
||||||
echo "DEQP RESULT: fail"
|
echo "bare-metal result: fail"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Wait until the job would have timed out anyway, so we don't spew a "init
|
# Wait until the job would have timed out anyway, so we don't spew a "init
|
||||||
|
|
Loading…
Reference in New Issue