From 0f1da26a271b6819a4f85234bfc6101d3c5cbb5e Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Mon, 4 Jun 2018 12:52:30 +0200 Subject: [PATCH] Run only allcols.load test for now --- debian/tests/control | 6 +----- debian/tests/local | 12 ------------ debian/tests/regress | 9 +++++---- 3 files changed, 6 insertions(+), 21 deletions(-) delete mode 100755 debian/tests/local diff --git a/debian/tests/control b/debian/tests/control index 0f0184c..6503bc4 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,7 +1,3 @@ -Depends: @, make, postgresql-10-ip4r +Depends: @, make Tests: regress Restrictions: allow-stderr - -Depends: @, make, default-mysql-server -Tests: local -Restrictions: allow-stderr, needs-root diff --git a/debian/tests/local b/debian/tests/local deleted file mode 100755 index 82d830c..0000000 --- a/debian/tests/local +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -set -ex - -trap "service mysql stop" 0 2 3 15 -service mysql start - -cd test -pg_virtualenv -i '--auth=trust' << EOF - set -ex - make -j1 local PGLOADER=/usr/bin/pgloader PGUSER=postgres DBPATH=sqlite/sqlite.db -EOF diff --git a/debian/tests/regress b/debian/tests/regress index 2e8aad0..e903a3a 100755 --- a/debian/tests/regress +++ b/debian/tests/regress @@ -1,10 +1,11 @@ #!/bin/sh -set -ex +set -eux cd test pg_virtualenv << EOF - set -ex - make -j1 prepare PGLOADER=/usr/bin/pgloader PGUSER=$(whoami) - make -j1 regress PGLOADER=/usr/bin/pgloader PGUSER=$(whoami) + set -eux + createdb pgloader + psql -d pgloader -c 'create schema expected' + make regress REGRESS=allcols.load PGHOST=::1 EOF