agora inbox for [email protected]  
help / color / mirror / Atom feed
From: Andres Freund <[email protected]>
Subject: [PATCH v1 1/6] meson: windows: Normalize slashes in prefix
Date: Tue, 27 Sep 2022 11:55:00 -0700

This fixes a build issue on windows, when the prefix is set to a path with
forward slashes. Windows python defaults to a path with a backslash, but mingw
ucrt python defaults to a forward slash. This in turn lead to a wrong PATH set
during tests, causing tests to fail.

Reported-by: Melih Mutlu <[email protected]>
Discussion: http://postgr.es/m/[email protected]
---
 meson.build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index 38b2c3aae2e..02c086c04e7 100644
--- a/meson.build
+++ b/meson.build
@@ -2733,15 +2733,15 @@ endif
 
 prefix = get_option('prefix')
 
-test_prefix = prefix
+test_prefix = fs.as_posix(prefix)
 
 if fs.is_absolute(get_option('prefix'))
   if host_system == 'windows'
-    if prefix.split(':\\').length() == 1
+    if prefix.split(':/').length() == 1
       # just a drive
       test_prefix = ''
     else
-      test_prefix = prefix.split(':\\')[1]
+      test_prefix = prefix.split(':/')[1]
     endif
   else
     assert(prefix.startswith('/'))
-- 
2.37.3.542.gdd3f6c4cae


--3mylvpkolouaexyj
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
	filename="v1-0002-meson-pg_regress-Define-a-HOST_TUPLE-sufficient-t.patch"



view thread (2+ messages)

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: [email protected]
  Cc: [email protected]
  Subject: Re: [PATCH v1 1/6] meson: windows: Normalize slashes in prefix
  In-Reply-To: <no-message-id-122455@localhost>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox