From f6fae39b2e9d9d32befe80715630816cf94e9022 Mon Sep 17 00:00:00 2001 From: Dimitri Fontaine Date: Tue, 3 Jun 2014 13:39:21 +0200 Subject: [PATCH] Explicitely use gawk in the new regression testing facility. Turns out that debian has mawk by default, which is not behaving the same in our very simple use case already. In passing, add gawk as a build dependency of the debian package, because the packaging is meant to exercize the test cases. --- Makefile | 2 +- debian/control | 2 +- test/regress.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 54e5ef9..c85a45d 100644 --- a/Makefile +++ b/Makefile @@ -124,7 +124,7 @@ pgloader-standalone: --output $(PGLOADER) test: - $(MAKE) PGLOADER=$(realpath $(PGLOADER)) -C test all + $(MAKE) PGLOADER=$(realpath $(PGLOADER)) -C test regress deb: docs # intended for use on a debian system diff --git a/debian/control b/debian/control index c15ea0a..5def6ff 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: pgloader Section: database Priority: extra Maintainer: Dimitri Fontaine -Build-Depends: debhelper (>= 8.0.0), sbcl (>= 1.1.13), ruby-ronn, buildapp (>= 1.5), cl-asdf (>= 3.0.3), cl-log, cl-postmodern, cl-qmynd, cl-split-sequence, cl-csv, cl-fad, cl-lparallel, cl-esrap, cl-alexandria, cl-drakma, cl-zip, cl-flexi-streams, cl-usocket, cl-local-time, cl-command-line-arguments, cl-abnf, cl-db3, cl-py-configparser, cl-sqlite, cl-trivial-backtrace, cl-markdown, cl-md5, cl-asdf-finalizers, cl-asdf-system-connections, cl-cffi (>= 1:0.12.0) +Build-Depends: debhelper (>= 8.0.0), sbcl (>= 1.1.13), ruby-ronn, buildapp (>= 1.5), cl-asdf (>= 3.0.3), cl-log, cl-postmodern, cl-qmynd, cl-split-sequence, cl-csv, cl-fad, cl-lparallel, cl-esrap, cl-alexandria, cl-drakma, cl-zip, cl-flexi-streams, cl-usocket, cl-local-time, cl-command-line-arguments, cl-abnf, cl-db3, cl-py-configparser, cl-sqlite, cl-trivial-backtrace, cl-markdown, cl-md5, cl-asdf-finalizers, cl-asdf-system-connections, cl-cffi (>= 1:0.12.0), gawk Standards-Version: 3.9.3 Homepage: https://github.com/dimitri/pgloader Vcs-Git: https://github.com/dimitri/pgloader.git diff --git a/test/regress.sh b/test/regress.sh index 78df647..2843ea2 100755 --- a/test/regress.sh +++ b/test/regress.sh @@ -8,8 +8,8 @@ pgloader=$1 command=$2 -targetdb=`awk -F '[ ?]+' '/^ *INTO|into/ {print $3}' < $command` -table=`awk -F '[ ?]+' '/^ *INTO|into/ {print $4}' < $command` +targetdb=`gawk -F '[ ?]+' '/^ *INTO|into/ {print $3}' < $command` +table=`gawk -F '[ ?]+' '/^ *INTO|into/ {print $4}' < $command` expected=regress/expected/`basename $2 .load`.out out=regress/out/`basename $2 .load`.out