Skip to content

Commit

Permalink
Add tap test to run-test
Browse files Browse the repository at this point in the history
  • Loading branch information
bonnefoa committed Jun 27, 2024
1 parent 244bf2a commit e47536e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 3 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ ARG PG_VERSION
# Install packages
RUN apt update
RUN DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
build-essential ca-certificates curl gnupg git less flex bison \
libcurl4-gnutls-dev libicu-dev libncurses-dev libxml2-dev zlib1g-dev libedit-dev \
libkrb5-dev liblz4-dev libncurses6 libpam-dev libreadline-dev libselinux1-dev \
libssl-dev libxslt1-dev libzstd-dev uuid-dev make openssl sudo postgresql-common \
ca-certificates curl gnupg make sudo gcc \
&& rm -rf /var/lib/apt/lists/*

RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
Expand All @@ -19,6 +16,7 @@ RUN echo "deb http://apt.postgresql.org/pub/repos/apt focal-pgdg main ${PG_VERSI
# Install PostgreSQL
RUN apt update \
&& DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
libcurl4-gnutls-dev libhttp-server-simple-perl libipc-run-perl \
postgresql-server-dev-${PG_VERSION} \
postgresql-${PG_VERSION} \
&& rm -rf /var/lib/apt/lists/*
Expand All @@ -45,6 +43,7 @@ COPY --chown=postgres pg_tracing.conf ./pg_tracing.conf

# Tests
COPY --chown=postgres ./sql/ ./sql
COPY --chown=postgres ./t/ ./t
COPY --chown=postgres ./expected/ ./expected

RUN make -s clean
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ run-test: build-test-pg$(PG_VERSION)
docker run \
--name $(TEST_CONTAINER_NAME) --rm \
$(TEST_CONTAINER_NAME):pg$(PG_VERSION) \
bash -c "PG_VERSION=$(PG_VERSION) make regresscheck_noinstall || (cat /usr/src/pg_tracing/regression.diffs && exit 1)"
bash -c "PG_VERSION=$(PG_VERSION) make regresscheck_noinstall || (cat /usr/src/pg_tracing/regression.diffs && exit 1); make installcheck"

0 comments on commit e47536e

Please sign in to comment.