On 2025-03-04 Tu 5:28 PM, Tom Lane wrote:
Andrew Dunstan<and...@dunslane.net> writes:
I think I found a logic bug. Testing.
Not sure what you are looking at, but I was trying to fix it
by making the loop over test modules skip unbuilt modules,
borrowing the test you added in v19 to skip unbuilt contrib
modules. It's a little more complicated for the other modules
because some of them have no .c files to be built, and I could
not get that to work. I eventually concluded that there's
something wrong with the "scalar glob()" idiom you used.
A bit of googling suggested "grep -e, glob()" instead, and
that seems to work for me. sifaka seems happy with the
attached patch.
I'm looking at something else, namely the attached.
Will check your patch out too.
--
Andrew Dunstan
EDB:https://www.enterprisedb.com
diff --git a/PGBuild/Utils.pm b/PGBuild/Utils.pm
index b97de92..d96dcec 100644
--- a/PGBuild/Utils.pm
+++ b/PGBuild/Utils.pm
@@ -417,7 +417,7 @@ sub check_install_is_complete
$tmp_loc = "$tmp_loc/$install_dir";
$bindir = "$tmp_loc/bin";
$libdir = "$tmp_loc/lib";
- $libdir .= '/postgresql' unless $libdir =~ /postgres|pgsql/;
+ $libdir .= '/postgresql' unless $install_dir =~ /postgres|pgsql/;
return (-d $bindir && -d $libdir);
}
elsif (-e "$build_dir/src/Makefile.global") # i.e. not msvc
@@ -429,7 +429,7 @@ sub check_install_is_complete
$tmp_loc = "$tmp_loc/$install_dir";
$bindir = "$tmp_loc/bin";
$libdir = "$tmp_loc/lib";
- $libdir .= '/postgresql' unless $libdir =~ /postgres|pgsql/;
+ $libdir .= '/postgresql' unless $install_dir =~ /postgres|pgsql/;
}
# these files should be present if we've temp_installed everything,
