From e57b916a6dbdea3321877bd6dca71edc29a3b642 Mon Sep 17 00:00:00 2001
From: keithy <keithy@consultant.com>
Date: Sat, 17 Aug 2019 14:53:07 +0100
Subject: [PATCH] tidied tests

---
 .travis.yml                                     | 2 +-
 Makefile                                        | 5 -----
 tests/Makefile                                  | 5 +++++
 Makefile.test => tests/Makefile.test            | 0
 {fails => tests/fails}/test_bash-spec-altfmt.sh | 2 +-
 {fails => tests/fails}/test_counters.sh         | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 Makefile
 create mode 100644 tests/Makefile
 rename Makefile.test => tests/Makefile.test (100%)
 rename {fails => tests/fails}/test_bash-spec-altfmt.sh (99%)
 rename {fails => tests/fails}/test_counters.sh (91%)

diff --git a/.travis.yml b/.travis.yml
index 3748f77..0acb2e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
 language: bash
 
 script:
-    - make
+    - make -C tests
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 2bd1bad..0000000
--- a/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-TESTS ?= $(wildcard tests/*.sh)
-
-include Makefile.test
-
-
diff --git a/tests/Makefile b/tests/Makefile
new file mode 100644
index 0000000..6962d28
--- /dev/null
+++ b/tests/Makefile
@@ -0,0 +1,5 @@
+TESTS ?= $(wildcard *.sh)
+
+include Makefile.test
+
+
diff --git a/Makefile.test b/tests/Makefile.test
similarity index 100%
rename from Makefile.test
rename to tests/Makefile.test
diff --git a/fails/test_bash-spec-altfmt.sh b/tests/fails/test_bash-spec-altfmt.sh
similarity index 99%
rename from fails/test_bash-spec-altfmt.sh
rename to tests/fails/test_bash-spec-altfmt.sh
index dec2a76..f71f633 100755
--- a/fails/test_bash-spec-altfmt.sh
+++ b/tests/fails/test_bash-spec-altfmt.sh
@@ -2,7 +2,7 @@
 
 DIR="${BASH_SOURCE%/*}"
 if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
-. "$DIR/../bash-spec.sh"
+. "$DIR/../../bash-spec.sh"
 
 describe "The bash version test" && {
 
diff --git a/fails/test_counters.sh b/tests/fails/test_counters.sh
similarity index 91%
rename from fails/test_counters.sh
rename to tests/fails/test_counters.sh
index f84a9ac..b49a99d 100755
--- a/fails/test_counters.sh
+++ b/tests/fails/test_counters.sh
@@ -2,7 +2,7 @@
 
 DIR="${BASH_SOURCE%/*}"
 if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
-. "$DIR/../bash-spec.sh"
+. "$DIR/../../bash-spec.sh"
 
 describe "A simple test" "$(