Skip to content

Commit afdc59e

Browse files
committed
Update github actions file (c-cpp.yml):
1. Enable TAP-tests 2. Add some useful options for configure and build stages. 3. Parameterize github CI, just to reduce code duplication. Authors: m.polyakova (mostly), and a.lepikhov.
1 parent e5946ac commit afdc59e

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.github/workflows/c-cpp.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,18 @@ jobs:
1717
steps:
1818
- name: pg
1919
run: |
20+
sudo apt install libipc-run-perl
21+
2022
echo "Deploying to production server on branch" $BRANCH_NAME
2123
git config --global user.email "[email protected]"
2224
git config --global user.name "CI PgPro admin"
25+
export COPT=-Werror
26+
export CONFIGURE_OPTS="--prefix=`pwd`/tmp_install --enable-tap-tests --enable-cassert"
2327
git clone https://github.com/postgres/postgres.git pg
2428
cd pg
29+
2530
git checkout REL_14_STABLE
26-
./configure --prefix=`pwd`/tmp_install CFLAGS="-O3"
31+
./configure $CONFIGURE_OPTS CFLAGS="-O3"
2732
git clone https://github.com/postgrespro/aqo.git contrib/aqo
2833
git -C contrib/aqo checkout $BRANCH_NAME
2934
patch -p1 --no-backup-if-mismatch < contrib/aqo/aqo_pg14.patch
@@ -33,6 +38,6 @@ jobs:
3338
echo "Use AQO with debug code included"
3439
git clean -fdx
3540
git -C contrib/aqo clean -fdx
36-
./configure --prefix=`pwd`/tmp_install CFLAGS="-DAQO_DEBUG_PRINT -O0"
41+
./configure $CONFIGURE_OPTS CFLAGS="-DAQO_DEBUG_PRINT -O0"
3742
make -j4 > /dev/null && make -j4 -C contrib > /dev/null
3843
env CLIENTS=50 THREADS=50 make -C contrib/aqo check

t/001_pgbench.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@
335335
"SELECT sum(executions_with_aqo) FROM test.aqo_query_stat");
336336

337337
# 25 trans * 10 clients * 4 query classes = 1000 + unique SELECT to pgbench_branches
338-
is($res, 1001, 'Each query should be logged in LEARN mode');
338+
is($res, $CLIENTS*100+1, 'Each query should be logged in LEARN mode');
339339
$res = $node->safe_psql('postgres',
340340
"SELECT sum(executions_without_aqo) FROM test.aqo_query_stat");
341341
is($res, 0, 'AQO has learned on the queries - 2');

0 commit comments

Comments
 (0)