OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: group RESULT logic in a single place

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21884>
This commit is contained in:
Eric Engestrom
2023-03-06 16:16:12 +00:00
committed by Marge Bot
parent 755282accc
commit 7176e0c160
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci/common/init-stage2.sh
View File

@@ -169,7 +169,6 @@ if [ -n "$HWCI_START_WESTON" ]; then
while [ ! -S "$WESTON_X11_SOCK" ]; do sleep 1; done while [ ! -S "$WESTON_X11_SOCK" ]; do sleep 1; done
fi fi
RESULT=fail
set +e set +e
bash -c ". $SCRIPTS_DIR/setup-test-env.sh && $HWCI_TEST_SCRIPT" bash -c ". $SCRIPTS_DIR/setup-test-env.sh && $HWCI_TEST_SCRIPT"
EXIT_CODE=$? EXIT_CODE=$?
@@ -193,7 +192,7 @@ fi
# We still need to echo the hwci: mesa message, as some scripts rely on it, such # We still need to echo the hwci: mesa message, as some scripts rely on it, such
# as the python ones inside the bare-metal folder # as the python ones inside the bare-metal folder
[ ${EXIT_CODE} -eq 0 ] && RESULT=pass [ ${EXIT_CODE} -eq 0 ] && RESULT=pass || RESULT=fail
set +x set +x
echo "hwci: mesa: $RESULT" echo "hwci: mesa: $RESULT"