From d9cf91ca8146c99d629c110973f4071ed496b03d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Carlos=20Nieto?= <jose.carlos@menteslibres.net> Date: Sat, 13 Jun 2015 09:17:50 -0500 Subject: [PATCH] Improving tests scripts. --- postgresql/Makefile | 14 ++++++++++++++ postgresql/_dumps/Makefile | 2 +- postgresql/_example/Makefile | 10 ++++++++++ postgresql/_example/test.sh | 3 --- 4 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 postgresql/Makefile create mode 100644 postgresql/_example/Makefile delete mode 100755 postgresql/_example/test.sh diff --git a/postgresql/Makefile b/postgresql/Makefile new file mode 100644 index 00000000..a5529f20 --- /dev/null +++ b/postgresql/Makefile @@ -0,0 +1,14 @@ +TEST_HOST ?= 127.0.0.1 + +build: + go build && go install + +reset-db: + $(MAKE) -C _dumps + +test: reset-db + go test -v + $(MAKE) -C _example + +bench: reset-db + go test -v -test.bench=. diff --git a/postgresql/_dumps/Makefile b/postgresql/_dumps/Makefile index 73176203..64253b53 100644 --- a/postgresql/_dumps/Makefile +++ b/postgresql/_dumps/Makefile @@ -5,5 +5,5 @@ DB_USERNAME ?= upperio_tests DB_PASSWORD ?= upperio_secret DB_NAME ?= upperio_tests -load: +reset-db: cat structs.sql | PGPASSWORD="$(DB_PASSWORD)" psql -U$(DB_USERNAME) $(DB_NAME) -h$(TEST_HOST) -p$(TEST_PORT) diff --git a/postgresql/_example/Makefile b/postgresql/_example/Makefile new file mode 100644 index 00000000..438918e4 --- /dev/null +++ b/postgresql/_example/Makefile @@ -0,0 +1,10 @@ +TEST_HOST ?= 127.0.0.1 +TEST_PORT ?= 5432 + +DB_USERNAME ?= upperio_tests +DB_PASSWORD ?= upperio_secret +DB_NAME ?= upperio_tests + +test: + cat example.sql | PGPASSWORD="$(DB_PASSWORD)" psql -U$(DB_USERNAME) $(DB_NAME) -h$(TEST_HOST) -p$(TEST_PORT) + go run -v main.go diff --git a/postgresql/_example/test.sh b/postgresql/_example/test.sh deleted file mode 100755 index 30b51db9..00000000 --- a/postgresql/_example/test.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cat example.sql | PGPASSWORD=upperio psql -Uupperio upperio_tests -htestserver.local -go run main.go -- GitLab