tidied tests

holmesjr · Aug 17, 2019 · e57b916 · e57b916
1 parent c86b05b
commit e57b916
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
 language: bash
 
 script:
-    - make
+    - make -C tests
diff --git a/Makefile b/Makefile
diff --git a/tests/Makefile b/tests/Makefile
@@ -0,0 +1,5 @@
+TESTS ?= $(wildcard *.sh)
+
+include Makefile.test
+
+
diff --git a/Makefile.test → tests/Makefile.test b/Makefile.test → tests/Makefile.test
diff --git a/fails/test_bash-spec-altfmt.sh → tests/fails/test_bash-spec-altfmt.sh b/fails/test_bash-spec-altfmt.sh → 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 → tests/fails/test_counters.sh b/fails/test_counters.sh → 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" "$(
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,5 @@
		TESTS ?= $(wildcard *.sh)

		include Makefile.test