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

Commit a3fd499

Browse files
Aleksandr KozhemyakinAlexander Lakhin
authored andcommitted
Revert workaround PGPRO-5369
1 parent d56789e commit a3fd499

File tree

2 files changed

+0
-18
lines changed

2 files changed

+0
-18
lines changed

tests_install/make_installcheck.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,6 @@ while read -r opt; do
145145
case "$opt" in --disable-dependency-tracking | --disable-rpath) ;; --disable-*) disconfopts="$disconfopts $opt" ;; esac;
146146
done <<< "$opts";
147147

148-
# Workaround for incorrect libpq in isolationtester for v14 on altlinux. (PGPRO-5369)
149-
ldlib=""
150-
if grep 'CPE_NAME="cpe:/o:alt:.*:p10"\|ALT Server 9.0\|ALT 8 SP Server\|ALT Linux 7.0.4 SPT' /etc/*-release >/dev/null 2>&1; then
151-
ver=`$1/bin/pg_config --version | sed -nE "s/[^0-9]+([0-9]+).*/\1/p"`
152-
if [ "$ver" == 14 ]; then
153-
ldlib="LD_LIBRARY_PATH=$1/lib:$LD_LIBRARY_PATH"
154-
fi
155-
fi
156148
# Pass to `./configure` disable-* options, that were passed to configure (if any; namely, --disable-online-upgrade)
157149
echo "Configuring with options: --enable-tap-tests --without-readline --prefix=$1 $disconfopts $extraoption"
158150
sudo -u postgres ./configure --enable-tap-tests --without-readline --prefix=$1 $disconfopts $extraoption || exit $?

tests_install/test_full_install.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -131,16 +131,6 @@ def check_executables(pginst, packages):
131131
for f in pfiles:
132132
if f.startswith('/usr/lib/debug/'):
133133
continue
134-
# PGPRO-5369
135-
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 == "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")):
142-
print("skip ldd isolationtester")
143-
continue
144134
fout = subprocess.check_output(
145135
'LANG=C file "%s"' % f, shell=True). \
146136
decode(ConsoleEncoding).strip()

0 commit comments

Comments
 (0)