mirror of
https://github.com/jimeh/tmuxifier.git
synced 2026-02-19 09:56:39 +00:00
Use test-runner.sh instead of homegrown test.sh
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,2 +1,3 @@
|
||||
test-runner.sh
|
||||
test/assert.sh
|
||||
test/stub.sh
|
||||
test/stub.sh
|
||||
|
||||
38
Makefile
38
Makefile
@@ -1,7 +1,24 @@
|
||||
test: prepare
|
||||
./test.sh
|
||||
test: bootstrap
|
||||
./test-runner.sh
|
||||
|
||||
prepare: test/assert.sh test/stub.sh
|
||||
bootstrap: test-runner.sh test/assert.sh test/stub.sh
|
||||
|
||||
clean: remove-test-runner.sh remove-assert.sh remove-stub.sh
|
||||
|
||||
test-runner.sh:
|
||||
test -f "test-runner.sh" || \
|
||||
echo "fetching test-runner.sh..." && \
|
||||
curl -s -L -o test-runner.sh \
|
||||
https://github.com/jimeh/test-runner.sh/raw/v0.1.0/test-runner.sh && \
|
||||
chmod +x test-runner.sh
|
||||
|
||||
remove-test-runner.sh:
|
||||
( \
|
||||
test -f "test-runner.sh" && rm "test-runner.sh" && \
|
||||
echo "removed test-runner.sh"\
|
||||
) || exit 0
|
||||
|
||||
update-test-runner.sh: remove-test-runner.sh test-runner.sh
|
||||
|
||||
test/assert.sh:
|
||||
test -f "test/assert.sh" || ( \
|
||||
@@ -10,13 +27,13 @@ test/assert.sh:
|
||||
https://raw.github.com/lehmannro/assert.sh/v1.0.2/assert.sh \
|
||||
)
|
||||
|
||||
update-assert.sh: remove-assert.sh test/assert.sh
|
||||
|
||||
remove-assert.sh:
|
||||
test -f "test/assert.sh" && \
|
||||
rm "test/assert.sh" && \
|
||||
echo "removed test/assert.sh"
|
||||
|
||||
update-assert.sh: remove-assert.sh test/assert.sh
|
||||
|
||||
test/stub.sh:
|
||||
test -f "test/stub.sh" || ( \
|
||||
echo "fetching test/stub.sh..." && \
|
||||
@@ -24,14 +41,15 @@ test/stub.sh:
|
||||
https://raw.github.com/jimeh/stub.sh/v1.0.1/stub.sh \
|
||||
)
|
||||
|
||||
update-stub.sh: remove-stub.sh test/stub.sh
|
||||
|
||||
remove-stub.sh:
|
||||
test -f "test/stub.sh" && \
|
||||
rm "test/stub.sh" && \
|
||||
echo "removed test/stub.sh"
|
||||
|
||||
update-stub.sh: remove-stub.sh test/stub.sh
|
||||
|
||||
.SILENT:
|
||||
.PHONY: test prepare \
|
||||
test/assert.sh update-assert.sh remove-assert.sh \
|
||||
test/stub.sh update-stub.sh remove-stub.sh
|
||||
.PHONY: test bootstrap clean \
|
||||
test-runner.sh remove-test-runner.sh update-test-runner.sh \
|
||||
test/assert.sh remove-assert.sh update-assert.sh \
|
||||
test/stub.sh remove-stub.sh update-stub.sh
|
||||
|
||||
35
test.sh
35
test.sh
@@ -1,35 +0,0 @@
|
||||
#! /usr/bin/env bash
|
||||
|
||||
resolve_link() {
|
||||
$(type -p greadlink readlink | head -1) $1
|
||||
}
|
||||
|
||||
abs_dirname() {
|
||||
local cwd="$(pwd)"
|
||||
local path="$1"
|
||||
|
||||
while [ -n "$path" ]; do
|
||||
cd "${path%/*}"
|
||||
local name="${path##*/}"
|
||||
path="$(resolve_link "$name" || true)"
|
||||
done
|
||||
|
||||
pwd
|
||||
cd "$cwd"
|
||||
}
|
||||
|
||||
|
||||
testdir="$(abs_dirname "$0")/test"
|
||||
testfiles="$(find "$testdir" -name "*-test.sh")"
|
||||
|
||||
RET=0
|
||||
for testfile in $testfiles; do
|
||||
echo ""
|
||||
echo -en "$(tput setaf 5)running: "
|
||||
echo -e "$(tput setaf 6)${testfile/#$(dirname "$testdir")\//}$(tput sgr0)"
|
||||
cd "$(dirname "$testfile")"
|
||||
"$testfile"
|
||||
if [ "$?" != "0" ]; then RET=1; fi
|
||||
done
|
||||
echo ""
|
||||
exit $RET
|
||||
Reference in New Issue
Block a user