Mesa (master): Revert "meson,ci: Disable sparse_array tests on windows"

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Apr 24 20:18:31 UTC 2020


Module: Mesa
Branch: master
Commit: 375c7a3863d141491bd81ca96605c709af118074
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=375c7a3863d141491bd81ca96605c709af118074

Author: Andres Gomez <agomez at igalia.com>
Date:   Wed Apr 22 16:36:33 2020 +0300

Revert "meson,ci: Disable sparse_array tests on windows"

The Wine version in the build image has been upgraded.

This reverts commit 6be65b077743fc80efe061b1e05cb13b2ff1a6b1.

Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>
Acked-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4678>

---

 src/util/meson.build | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/util/meson.build b/src/util/meson.build
index 68ae31f421b..2851c0c9880 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -315,10 +315,7 @@ if with_tests
   endif
   subdir('tests/vma')
   subdir('tests/set')
-  # FIXME: this test on the Wine version in GitLab CI
-  if host_machine.system() != 'windows'
-    subdir('tests/sparse_array')
-  endif
+  subdir('tests/sparse_array')
   subdir('tests/format')
   subdir('tests/vector')
 endif



More information about the mesa-commit mailing list