Skip to content

Commit 8140eca

Browse files
1aceMarge Bot
authored and
Marge Bot
committed
meson: replace deprecated meson.get_cross_property(...) with meson.get_external_property(...)
According to the deprecation note: > It's a pure subset of meson.get_external_property, and works strangely > in host == build configurations, since it would be more accurately > described as get_host_property. Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Dylan Baker <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19904>
1 parent 9b6ab40 commit 8140eca

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

.gitlab-ci/meson/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fi
2424
# tests in their meson.build with:
2525
#
2626
# test(...,
27-
# should_fail: meson.get_cross_property('xfail', '').contains(t),
27+
# should_fail: meson.get_external_property('xfail', '').contains(t),
2828
# )
2929
#
3030
# where t is the name of the test, and the '' is the string to search when

src/compiler/nir/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ if with_tests
437437
),
438438
suite : ['compiler', 'nir'],
439439
# TODO: Use a negative filter for gtest instead of the expect failure here.
440-
should_fail : meson.get_cross_property('xfail', '').contains('load_store_vectorizer'),
440+
should_fail : meson.get_external_property('xfail', '').contains('load_store_vectorizer'),
441441
protocol : gtest_test_protocol,
442442
)
443443

src/gallium/drivers/llvmpipe/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ if with_tests and with_gallium_softpipe and draw_with_llvm
140140
link_with : [libllvmpipe, libgallium],
141141
),
142142
suite : ['llvmpipe'],
143-
should_fail : meson.get_cross_property('xfail', '').contains(t),
143+
should_fail : meson.get_external_property('xfail', '').contains(t),
144144
timeout: 240,
145145
)
146146
endforeach

src/gallium/tests/unit/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ foreach t : ['pipe_barrier_test', 'u_cache_test', 'u_half_test',
3939
endif
4040
elif t != 'u_cache_test' # u_cache_test is slow
4141
test(t, exe, suite: 'gallium',
42-
should_fail : meson.get_cross_property('xfail', '').contains(t),
42+
should_fail : meson.get_external_property('xfail', '').contains(t),
4343
)
4444
endif
4545
endforeach

src/util/tests/format/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ foreach t : ['srgb', 'u_format_test', 'u_format_compatible_test']
77
dependencies : idep_mesautil,
88
),
99
suite : 'format',
10-
should_fail : meson.get_cross_property('xfail', '').contains(t),
10+
should_fail : meson.get_external_property('xfail', '').contains(t),
1111
)
1212
endforeach

0 commit comments

Comments
 (0)