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

Commit 26a4ef7

Browse files
author
Alexander Lakhin
committed
Merge branch 'master' into 'master'
Remove constants for GosLinux 6.4 (as not supported); Target sqlsmith to the known working commit See merge request automation/pg-tests!1348
2 parents 61d980e + bb130a9 commit 26a4ef7

File tree

3 files changed

+2
-16
lines changed

3 files changed

+2
-16
lines changed

helpers/constants.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -269,14 +269,6 @@
269269
'postgrespro-ent-11': None,
270270
'postgrespro-1c-9.6': None
271271
},
272-
# may be remove?
273-
"GosLinux 6.4": {
274-
'postgresql--9.6': None,
275-
'postgresql--10': None,
276-
'postgresql--11': None,
277-
'postgresql--12': None,
278-
'postgresql--13': None,
279-
},
280272
# redos-7
281273
"RED OS 7.2": {
282274
'postgresql--9.6': None,

tests_install/sqlsmith.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ fi
6161
autoreconf -fi
6262
CXXFLAGS="-std=c++11" ./configure --prefix=$basedir/libpqxx --disable-documentation && make && make install
6363
cd ~test/pg-tests
64-
curl --tlsv1.2 -sS -L https://github.com/anse1/sqlsmith/archive/master.tar.gz \
64+
curl --tlsv1.2 -sS -L https://github.com/anse1/sqlsmith/archive/2dc83ee8.tar.gz \
6565
-o ss.tar.gz || \
66-
wget https://github.com/anse1/sqlsmith/archive/master.tar.gz -O ss.tar.gz
66+
wget https://github.com/anse1/sqlsmith/archive/2dc83ee8.tar.gz -O ss.tar.gz
6767
tar fax ss.tar.gz
6868
cd sqlsmith*/
6969
sed -e 's|\[m4_esyscmd_s(\[git describe --dirty --tags --always\])\]|1|' -i configure.ac # To do with old autoconf and without git

tests_install/test_upgrade_minor.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,6 @@
6262
'Debian GNU/Linux 8': {
6363
'postgrespro-ent-9.6': '9.6.7.1'
6464
},
65-
# maybe remove?
66-
'GosLinux 6.4': {
67-
'postgrespro-std-9.6': None,
68-
'postgrespro-ent-9.6': None,
69-
'postgrespro-ent-10': None
70-
},
7165
'GosLinux 7': {
7266
'postgrespro-std-9.6': None,
7367
'postgrespro-std-10': '10.6.1',

0 commit comments

Comments
 (0)