From a1cf610d3c276447b9e692498a9a04413ceeb323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Nordstr=C3=B6m?= Date: Mon, 7 Jun 2021 10:35:04 +0200 Subject: [PATCH] Run ABI tests with TAP support Install the Perl prerequisites when building the image for ABI tests, including the `prove` binary. Although the ABI tests currently don't run TAP tests, CMake still failed the configuration since it expects the prerequisites to be installed unless it is run with `-DTAP_CHECKS=off`. --- .github/workflows/coverity.yaml | 2 +- scripts/docker-run-abi-test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coverity.yaml b/.github/workflows/coverity.yaml index 4c1bc516d..74393110d 100644 --- a/.github/workflows/coverity.yaml +++ b/.github/workflows/coverity.yaml @@ -55,7 +55,7 @@ jobs: - name: Build TimescaleDB run: | PATH="$GITHUB_WORKSPACE/coverity/bin:$PATH" - ./bootstrap -DCMAKE_BUILD_TYPE=Release -DPG_SOURCE_DIR=~/$PG_SRC_DIR -DPG_PATH=~/$PG_INSTALL_DIR + ./bootstrap -DCMAKE_BUILD_TYPE=Release -DPG_SOURCE_DIR=~/$PG_SRC_DIR -DPG_PATH=~/$PG_INSTALL_DIR -DTAP_CHECKS=off cov-build --dir cov-int make -C build - name: Upload report diff --git a/scripts/docker-run-abi-test.sh b/scripts/docker-run-abi-test.sh index 840f161a7..f91906423 100755 --- a/scripts/docker-run-abi-test.sh +++ b/scripts/docker-run-abi-test.sh @@ -35,7 +35,7 @@ create_base_container() { docker run -u postgres -d -e POSTGRES_HOST_AUTH_METHOD=trust --name $1 -v ${BASE_DIR}:/src -v ${COMPILE_VOLUME}:/compile $2 # Install build dependencies - docker exec -u root $1 /bin/bash -c "apk add --no-cache --virtual .build-deps coreutils dpkg-dev gcc libc-dev make util-linux-dev diffutils cmake bison flex openssl-dev && mkdir -p /build/debug" + docker exec -u root $1 /bin/bash -c "apk add --no-cache --virtual .build-deps coreutils dpkg-dev gcc libc-dev make util-linux-dev diffutils cmake bison flex openssl-dev perl perl-utils perl-test-harness-utils perl-ipc-run && mkdir -p /build/debug " # Copy the source files to build directory docker exec -u root $1 /bin/bash -c "cp -a /src/{src,sql,scripts,test,tsl,CMakeLists.txt,timescaledb.control.in,version.config} /build/ && cd /build/debug/ && CFLAGS=-Werror cmake .. -DCMAKE_BUILD_TYPE=Debug -DREGRESS_CHECKS=OFF && make -C /build/debug install && chown -R postgres /build"