From 0b9cecef4d662e4ecc3c6ce34ac7dcac32fb13d9 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Fri, 19 Jun 2020 23:23:43 -0400
Subject: [PATCH] tests: move testing command into config

---
 .circleci/config.yml |  9 +++++++--
 tests.mk             | 26 --------------------------
 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ab7f0b0f1..94c9f2226 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -83,7 +83,10 @@ jobs:
       - init-tests
       - run:
           shell: /bin/bash
-          command: sudo -E make -e test-ci-<< parameters.index >>
+          command: |
+            @mkdir -p test-results/bats
+            @cd tests/unit && echo "executing tests: $(shell cd tests/unit ; ls << parameters.index >>*.bats | xargs)"
+            cd tests/unit && bats --formatter bats-format-junit -e -T -o ../../test-results/bats $(shell cd tests/unit ; ls << parameters.index >>*.bats | xargs)
           no_output_timeout: 60m
       - store_artifacts:
           path: ./test-results
@@ -98,15 +101,17 @@ workflows:
       - docker-deploy-tests:
           requires:
             - build
+            - unit-tests
       - go-tests:
           matrix:
             parameters:
               index: [0, 1, 2, 3]
           requires:
             - build
+            - unit-tests
       - unit-tests:
           matrix:
             parameters:
-              index: [0, 1, 2, 3, 4]
+              index: [10, 20, 30, 40, 50, 60]
           requires:
             - build
diff --git a/tests.mk b/tests.mk
index e7e5c8a96..1d16ef943 100644
--- a/tests.mk
+++ b/tests.mk
@@ -267,30 +267,4 @@ test-ci:
 	@cd tests/unit && echo "executing tests: $(shell cd tests/unit ; circleci tests glob *.bats | circleci tests split --split-by=timings --timings-type=classname | xargs)"
 	cd tests/unit && bats --formatter bats-format-junit -e -T -o ../../test-results/bats $(shell cd tests/unit ; circleci tests glob *.bats | circleci tests split --split-by=timings --timings-type=classname | xargs)
 
-test-ci-0:
-	@mkdir -p test-results/bats
-	@cd tests/unit && echo "executing tests: $(shell cd tests/unit ; ls 10*.bats | xargs)"
-	cd tests/unit && bats --formatter bats-format-junit -e -T -o ../../test-results/bats $(shell cd tests/unit ; ls 10*.bats | xargs)
-
-test-ci-1:
-	@mkdir -p test-results/bats
-	@cd tests/unit && echo "executing tests: $(shell cd tests/unit ; ls 20*.bats | xargs)"
-	cd tests/unit && bats --formatter bats-format-junit -e -T -o ../../test-results/bats $(shell cd tests/unit ; ls 20*.bats | xargs)
-
-test-ci-2:
-	@mkdir -p test-results/bats
-	@cd tests/unit && echo "executing tests: $(shell cd tests/unit ; ls 20*.bats | xargs)"
-	cd tests/unit && bats --formatter bats-format-junit -e -T -o ../../test-results/bats $(shell cd tests/unit ; ls 30*.bats | xargs)
-
-test-ci-3:
-	@mkdir -p test-results/bats
-	@cd tests/unit && echo "executing tests: $(shell cd tests/unit ; ls 40*.bats | xargs)"
-	cd tests/unit && bats --formatter bats-format-junit -e -T -o ../../test-results/bats $(shell cd tests/unit ; ls 40*.bats | xargs)
-
-test-ci-4:
-	@mkdir -p test-results/bats
-	@cd tests/unit && echo "executing tests: $(shell cd tests/unit ; ls 50*.bats | xargs)"
-	cd tests/unit && bats --formatter bats-format-junit -e -T -o ../../test-results/bats $(shell cd tests/unit ; ls 50*.bats | xargs)
-
-
 test-ci-docker: setup-docker-deploy-tests deploy-test-checks-root deploy-test-config deploy-test-multi deploy-test-go-fail-predeploy deploy-test-go-fail-postdeploy