Skip to content

Commit 3d41747

Browse files
committed
ci: fix MERGE_TOOL_DIR on Windows with Meson
On Windows, we execute tests with "--no-bin-wrappers". a87e427 (ci: speed up Windows phase, 2019-01-29)
1 parent 704ec9c commit 3d41747

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

t/meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,6 +1208,7 @@ endif
12081208

12091209
test_environment = script_environment
12101210
test_environment.set('GIT_BUILD_DIR', git_build_dir)
1211+
test_environment.set('MERGE_TOOLS_DIR', meson.project_source_root() / 'mergetools')
12111212

12121213
foreach integration_test : integration_tests
12131214
test(fs.stem(integration_test), shell,

0 commit comments

Comments
 (0)