ci/vkd3d: limit the vulkaninfo capture to the driverInfo line
This made for huge error messages when printing `Found $(vulkaninfo), expected $MESA_VERSION`, with the actual information lost in the flood. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29749>
This commit is contained in:

committed by
Marge Bot

parent
285ba60166
commit
e266b6287e
@@ -37,7 +37,7 @@ quiet() {
|
||||
# Sanity check to ensure that our environment is sufficient to make our tests
|
||||
# run against the Mesa built by CI, rather than any installed distro version.
|
||||
MESA_VERSION=$(cat "$INSTALL/VERSION")
|
||||
if ! vulkaninfo | tee /tmp/version.txt | grep -F "Mesa $MESA_VERSION";
|
||||
if ! vulkaninfo | grep driverInfo | tee /tmp/version.txt | grep -F "Mesa $MESA_VERSION";
|
||||
then
|
||||
printf "%s\n" "Found $(cat /tmp/version.txt), expected $MESA_VERSION"
|
||||
exit 1
|
||||
|
Reference in New Issue
Block a user