Skip to content
This repository was archived by the owner on Oct 10, 2023. It is now read-only.

Commit d2014f4

Browse files
author
Alexander Lakhin
committed
Merge branch 'master' into 'master'
Extend workaround for PGPRO-5369 to altlinux-10 See merge request automation/pg-tests!1339
2 parents a669e27 + a274351 commit d2014f4

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

tests_install/make_installcheck.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ done <<< "$opts";
147147

148148
# Workaround for incorrect libpq in isolationtester for v14 on altlinux. (PGPRO-5369)
149149
ldlib=""
150-
if grep 'ALT Server 9.0\|ALT 8 SP Server' /etc/*-release >/dev/null 2>&1; then
150+
if grep 'CPE_NAME="cpe:/o:alt:.*:p10"\|ALT Server 9.0\|ALT 8 SP Server' /etc/*-release >/dev/null 2>&1; then
151151
ver=`$1/bin/pg_config --version | grep -oP '\d{2}'`
152152
if [ $ver == 14 ]; then
153153
ldlib="LD_LIBRARY_PATH=$1/lib:$LD_LIBRARY_PATH"

tests_install/test_full_install.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,12 @@ def check_executables(pginst, packages):
133133
continue
134134
# PGPRO-5369
135135
if f.endswith("/isolationtester") and pginst.version == "14":
136-
if (pginst.os_name == "ALT Server" and
137-
pginst.os_version == "9.0") or \
138-
(pginst.os_name in "ALT SPServer" and
139-
pginst.os_version in ("8.0", "8.2")):
136+
if ((pginst.os_name == "ALT Server" and
137+
pginst.os_version == "9.0") or
138+
(pginst.os_name == "ALT SPServer" and
139+
pginst.os_version in ("8.0", "8.2")) or
140+
(pginst.os_name == "starter kit" and
141+
pginst.os_version == "p10")):
140142
print("skip ldd isolationtester")
141143
continue
142144
fout = subprocess.check_output(

0 commit comments

Comments
 (0)