From 6590858cd2dbacbc98c8d218198648a4ada10d16 Mon Sep 17 00:00:00 2001 From: Sven Klemm Date: Wed, 15 Jan 2020 15:58:11 +0100 Subject: [PATCH] Ignore parallel test result in 32 bit tests The worker assignment for parallel queries behaves differently from the 64 bit builds leading to differences in plan output and failing tests. This commit ignores the results of the parallel tests for 32 bit builds. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ba03a6a62..2f13d2a25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -123,7 +123,7 @@ jobs: # Now build with OpenSSL - docker exec -it pgbuild /bin/sh -c "cd /build/debug && cmake .. -DCMAKE_BUILD_TYPE=Debug -DUSE_OPENSSL=true -DENABLE_CODECOVERAGE=TRUE -DPG_SOURCE_DIR=/postgres ${OTHER_CMAKE_FLAGS:-} && make install && chown -R postgres:postgres /build/debug/" # Now run all tests - - ${RETRY_PREFIX} docker exec -u postgres -it pgbuild /bin/sh -c "make -k -C /build/debug installcheck IGNORES='append-10 bgw_db_scheduler chunk_adaptive ordered_append-10 transparent_decompression-10' PG_REGRESS_OPTS='--temp-instance=/tmp/pgdata'" + - ${RETRY_PREFIX} docker exec -u postgres -it pgbuild /bin/sh -c "make -k -C /build/debug installcheck IGNORES='append-10 bgw_db_scheduler chunk_adaptive ordered_append-10 parallel-10 transparent_decompression-10' PG_REGRESS_OPTS='--temp-instance=/tmp/pgdata'" - if: (type = cron) OR (branch = prerelease_test) stage: test @@ -141,7 +141,7 @@ jobs: # Now build with OpenSSL - docker exec -it pgbuild /bin/sh -c "cd /build/debug && cmake .. -DCMAKE_BUILD_TYPE=Debug -DUSE_OPENSSL=true -DENABLE_CODECOVERAGE=TRUE -DPG_SOURCE_DIR=/postgres ${OTHER_CMAKE_FLAGS:-} && make install && chown -R postgres:postgres /build/debug/" # Now run all tests - - ${RETRY_PREFIX} docker exec -u postgres -it pgbuild /bin/sh -c "make -k -C /build/debug installcheck IGNORES='append-11 bgw_db_scheduler chunk_adaptive ordered_append-11 transparent_decompression-11' PG_REGRESS_OPTS='--temp-instance=/tmp/pgdata'" + - ${RETRY_PREFIX} docker exec -u postgres -it pgbuild /bin/sh -c "make -k -C /build/debug installcheck IGNORES='append-11 bgw_db_scheduler chunk_adaptive ordered_append-11 parallel-11 transparent_decompression-11' PG_REGRESS_OPTS='--temp-instance=/tmp/pgdata'" # This runs tests on ARM32 emulation - if: branch = arm_test