From b1a1db06b6cd636eeb4f0cfdf9313f0b9929fc62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Nieto?= <jose@xiam.io>
Date: Sat, 2 May 2020 20:45:57 -0500
Subject: [PATCH] update "test-adapters" target and modify "parallel" flags

---
 Makefile            | 8 ++------
 mongo/Makefile      | 2 +-
 mssql/Makefile      | 4 ++--
 mysql/Makefile      | 2 +-
 postgresql/Makefile | 2 +-
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 0655077f..d667b526 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 SHELL                 := /bin/bash
 
-PARALLEL_FLAGS        ?= --halt now,fail=1 --jobs=2 -v -u
+PARALLEL_FLAGS        ?= --halt-on-error 2 --jobs=2 -v -u
 
 TEST_FLAGS            ?=
 
@@ -29,11 +29,7 @@ test-libs:
 			lib \
 			internal
 
-test-adapters:
-	for MAKEFILE in $$(grep -Rl test-extended */Makefile | sort -u); do \
-		ADAPTER=$$(dirname $$MAKEFILE); \
-		($(MAKE) test-adapter-$$ADAPTER || exit 1); \
-	done
+test-adapters: test-adapter-mysql test-adapter-mssql test-adapter-sqlite test-adapter-ql test-adapter-mongo
 
 test-adapter-%:
 	($(MAKE) -C $* test-extended || exit 1)
diff --git a/mongo/Makefile b/mongo/Makefile
index 76aa66e6..c677a145 100644
--- a/mongo/Makefile
+++ b/mongo/Makefile
@@ -12,7 +12,7 @@ DB_USERNAME           ?= upperio_user
 DB_PASSWORD           ?= upperio//s3cr37
 
 TEST_FLAGS            ?=
-PARALLEL_FLAGS        ?=
+PARALLEL_FLAGS        ?= --halt-on-error 2 --jobs 1
 
 export MONGO_VERSION
 
diff --git a/mssql/Makefile b/mssql/Makefile
index 08a0f8bb..b65789c1 100644
--- a/mssql/Makefile
+++ b/mssql/Makefile
@@ -12,7 +12,7 @@ DB_USERNAME           ?= sa
 DB_PASSWORD           ?= upperio//s3cr37
 
 TEST_FLAGS            ?=
-PARALLEL_FLAGS        ?=
+PARALLEL_FLAGS        ?= --halt-on-error 2 --jobs 1
 
 export MSSQL_VERSION
 
@@ -29,7 +29,7 @@ test:
 
 server-up: server-down
 	docker-compose -p $(PROJECT) up -d && \
-	sleep 10
+	sleep 15
 
 server-down:
 	docker-compose -p $(PROJECT) down
diff --git a/mysql/Makefile b/mysql/Makefile
index 8e48693e..02f8a255 100644
--- a/mysql/Makefile
+++ b/mysql/Makefile
@@ -12,7 +12,7 @@ DB_USERNAME           ?= upperio_user
 DB_PASSWORD           ?= upperio//s3cr37
 
 TEST_FLAGS            ?=
-PARALLEL_FLAGS        ?=
+PARALLEL_FLAGS        ?= --halt-on-error 2 --jobs 1
 
 export MYSQL_VERSION
 
diff --git a/postgresql/Makefile b/postgresql/Makefile
index 63f24f2a..6638f5e1 100644
--- a/postgresql/Makefile
+++ b/postgresql/Makefile
@@ -12,7 +12,7 @@ DB_USERNAME           ?= upperio_user
 DB_PASSWORD           ?= upperio//s3cr37
 
 TEST_FLAGS            ?=
-PARALLEL_FLAGS        ?=
+PARALLEL_FLAGS        ?= --halt-on-error 2 --jobs 1
 
 export POSTGRES_VERSION
 
-- 
GitLab