Skip to content

Commit 082cc11

Browse files
committed
Run simple tests for code coverage needs
1 parent 198af9e commit 082cc11

File tree

6 files changed

+34
-33
lines changed

6 files changed

+34
-33
lines changed

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
run: ci_scripts/setup-keyring-servers.sh
2626

2727
- name: Test postgres with TDE to generate coverage
28-
run: ci_scripts/make-test-tde.sh --continue --tde-only
28+
run: ci_scripts/make-test.sh --tde-only
2929

3030
- name: Collect coverage data
3131
run: find . -type f -name "*.c" ! -path '*libkmip*' | xargs -t gcov -abcfu

.github/workflows/psp-reusable.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ jobs:
104104
- name: Setup kmip and vault
105105
run: src/ci_scripts/setup-keyring-servers.sh
106106

107-
- name: Test postgres with TDE
108-
run: src/ci_scripts/${{ inputs.build_script }}-test-tde.sh --continue
107+
- name: Test postgres with TDE as default access method
108+
run: src/ci_scripts/${{ inputs.build_script }}-test-global-tde.sh --continue
109109

110110
- name: Report on test fail
111111
uses: actions/upload-artifact@v4
File renamed without changes.

ci_scripts/make-test-global-tde.sh

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/bash
2+
3+
set -e
4+
ADD_FLAGS=
5+
6+
for arg in "$@"
7+
do
8+
case "$arg" in
9+
--continue)
10+
ADD_FLAGS="-k"
11+
shift;;
12+
esac
13+
done
14+
15+
SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
16+
source $SCRIPT_DIR/env.sh
17+
source $SCRIPT_DIR/configure-global-tde.sh
18+
19+
EXTRA_REGRESS_OPTS="--extra-setup=$SCRIPT_DIR/tde_setup.sql" make -s installcheck-world $ADD_FLAGS

ci_scripts/make-test-tde.sh

Lines changed: 0 additions & 30 deletions
This file was deleted.

ci_scripts/make-test.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
#!/bin/bash
22

3+
set -e
4+
TDE_ONLY=0
5+
6+
for arg in "$@"
7+
do
8+
case "$arg" in
9+
--tde-only)
10+
TDE_ONLY=1
11+
shift;;
12+
esac
13+
done
14+
315
SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)"
416
INSTALL_DIR="$SCRIPT_DIR/../../pginst"
517
source $SCRIPT_DIR/env.sh

0 commit comments

Comments
 (0)