From 00f5dadd5b7d71c30bd7393d165a87f554eb92e5 Mon Sep 17 00:00:00 2001
From: "Michael Hirsch, Ph.D" <10931741+scivision@users.noreply.github.com>
Date: Thu, 30 Jan 2020 16:07:44 -0500
Subject: Bugfix: sanitize_dir: use pathlib to handle case-insensitive
filesystems (#6398)
---
run_project_tests.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
(limited to 'run_project_tests.py')
diff --git a/run_project_tests.py b/run_project_tests.py
index acad225..e4dd8f7 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -381,7 +381,7 @@ def _run_test(testdir, test_build_dir, install_dir, extra_args, compiler, backen
setup_env = None
# Configure in-process
if pass_prefix_to_test(testdir):
- gen_args = ['--prefix', '/usr']
+ gen_args = ['--prefix', 'x:/usr'] if mesonlib.is_windows() else ['--prefix', '/usr']
else:
gen_args = []
if pass_libdir_to_test(testdir):
@@ -547,6 +547,10 @@ def skippable(suite, test):
if not suite.endswith('frameworks'):
return True
+ # this test assumptions aren't valid for Windows paths
+ if test.endswith('38 libdir must be inside prefix'):
+ return True
+
# gtk-doc test may be skipped, pending upstream fixes for spaces in
# filenames landing in the distro used for CI
if test.endswith('10 gtk-doc'):
--
cgit v1.1