From e1dbf10749ca52604005551a5077c0997efcf428 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 22 May 2018 17:32:21 -0700 Subject: [PATCH] meson: don't build or run mesa-sha1 test on windows It crashes hard (pop-up window and all). v2: - Change comment to FIXME Reviewed-by: Eric Engestrom Acked-by: Kristian H. Kristensen --- src/util/meson.build | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/util/meson.build b/src/util/meson.build index 56030203763..8260fbab2de 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -241,17 +241,20 @@ if with_tests suite : ['util'], ) - test( - 'mesa-sha1', - executable( - 'mesa-sha1_test', - files('mesa-sha1_test.c'), - include_directories : inc_common, - dependencies : idep_mesautil, - c_args : [c_msvc_compat_args], - ), - suite : ['util'], - ) + # FIXME: this test crashes on windows + if host_machine.system() != 'windows' + test( + 'mesa-sha1', + executable( + 'mesa-sha1_test', + files('mesa-sha1_test.c'), + include_directories : inc_common, + link_with : _libmesa_util, + c_args : [c_msvc_compat_args], + ), + suite : ['util'], + ) + endif test( 'bitset', -- 2.30.2