Module: Mesa Branch: master Commit: dd471928c94e31d103ac94d397122ff42d20b983 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd471928c94e31d103ac94d397122ff42d20b983
Author: Alexandros Frantzis <[email protected]> Date: Thu Sep 3 14:22:40 2020 +0300 tracie: Make tests independent of environment Provide some sensible values for required environment variables to allow tests to run properly in any environment. Signed-off-by: Alexandros Frantzis <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Reviewed-by: Pierre-Eric Pelloux-Prayer <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6598> --- .gitlab-ci/tracie-runner-gl.sh | 2 +- .gitlab-ci/tracie/tests/test.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/tracie-runner-gl.sh b/.gitlab-ci/tracie-runner-gl.sh index da4ce3987b6..418dd3d3eb3 100755 --- a/.gitlab-ci/tracie-runner-gl.sh +++ b/.gitlab-ci/tracie-runner-gl.sh @@ -33,7 +33,7 @@ mkdir -p $RESULTS # Perform a self-test to ensure tracie is working properly. if [ -z "$TRACIE_NO_UNIT_TESTS" ]; then - TRACIE_UPLOAD_TO_MINIO=0 python3 -m pytest -v --pyargs $INSTALL/tracie/tests/test.py + python3 -m pytest -v --pyargs $INSTALL/tracie/tests/test.py fi if [ "$GALLIUM_DRIVER" = "virpipe" ]; then diff --git a/.gitlab-ci/tracie/tests/test.py b/.gitlab-ci/tracie/tests/test.py index 21264cc882a..ff4780cbe3b 100644 --- a/.gitlab-ci/tracie/tests/test.py +++ b/.gitlab-ci/tracie/tests/test.py @@ -58,7 +58,10 @@ def prepare_for_run(tmp_path): shutil.move("./tests/test-data", "./traces-db") # Disable trace storing environ["TRACIE_STORE_IMAGES"] = "0" - + environ["TRACIE_UPLOAD_TO_MINIO"] = "0" + environ["CI_PROJECT_PATH"] = "test-project" + environ["CI_PIPELINE_ID"] = "667" + environ["CI_JOB_ID"] = "42" def cleanup(tmp_path): ''' _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
