Skip to content

Commit

Permalink
ci: Allow specifying any shell command via HWCI_TEST_SCRIPT
Browse files Browse the repository at this point in the history
Interpret the value of HWCI_TEST_SCRIPT environment variable as a shell
command. This allows, for example, to provide additional environment
variables: HWCI_TEST_SCRIPT="VAR1=VAL1 VAR2=VAL2 /path/to/script"

Additionally, add the missing execute permission flags to
gtest-runner.sh script.

Signed-off-by: Cristian Ciocaltea <[email protected]>
Reviewed-by: Guilherme Gallo <[email protected]>
Reviewed-by: Tomeu Vizoso <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15208>
  • Loading branch information
cristicc authored and Marge Bot committed Mar 22, 2022
1 parent fb2ffc2 commit 356c9c2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .gitlab-ci/common/init-stage2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ if [ -n "$HWCI_START_XORG" ]; then
export DISPLAY=:0
fi

sh "$HWCI_TEST_SCRIPT" && RESULT=pass || RESULT=fail
sh -c "$HWCI_TEST_SCRIPT" && RESULT=pass || RESULT=fail

# Let's make sure the results are always stored in current working directory
mv -f ${CI_PROJECT_DIR}/results ./ 2>/dev/null || true
Expand Down
Empty file modified .gitlab-ci/gtest-runner.sh
100644 → 100755
Empty file.

0 comments on commit 356c9c2

Please sign in to comment.