summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtests/assert-clean.sh21
-rwxr-xr-xtests/assert-deps.sh1
-rwxr-xr-xtests/assert-install.sh15
-rwxr-xr-xtests/assert-uninstall.sh13
4 files changed, 34 insertions, 16 deletions
diff --git a/tests/assert-clean.sh b/tests/assert-clean.sh
index ffa37a8..a3ca350 100755
--- a/tests/assert-clean.sh
+++ b/tests/assert-clean.sh
@@ -1,12 +1,6 @@
#!/bin/sh
set -eu
-if [ -n "${RECURSIVE_CHECK:-}" ]; then
- exit
-fi
-export RECURSIVE_CHECK=true
-
-
if [ ! -e .git ]; then
echo "Not in a Git repository, skipping \"$0\"" >&2
exit
@@ -15,16 +9,17 @@ fi
. tools/lib.sh
-D="$(mkdtemp)"
-trap 'rm -rf "$D"' EXIT
-
+R="$(mkdtemp)"
+trap 'rm -rf "$R"' EXIT
-git clone -q --depth=1 file://"$PWD" "$D"
-cd "$D"
+git clone -q --depth=1 file://"$PWD" "$R"
+cd "$R"
-make all check 1>/dev/null 2>&1 ||:
-make -s clean
+{
+ make
+ make clean
+} 1>/dev/null 2>&1
{
printf '%s: "clean" target deletes all derived assets...' \
diff --git a/tests/assert-deps.sh b/tests/assert-deps.sh
index 0c0f02e..9bfc5ea 100755
--- a/tests/assert-deps.sh
+++ b/tests/assert-deps.sh
@@ -6,6 +6,7 @@ if [ ! -e .git ]; then
exit
fi
+
. tools/lib.sh
F="$(mkstemp)"
diff --git a/tests/assert-install.sh b/tests/assert-install.sh
index 65080df..b10c037 100755
--- a/tests/assert-install.sh
+++ b/tests/assert-install.sh
@@ -1,17 +1,28 @@
#!/bin/sh
set -eu
+if [ ! -e .git ]; then
+ echo "Not in a Git repository, skipping \"$0\"." >&2
+ exit
+fi
+
+
. tools/lib.sh
D="$(mkdtemp)"
-trap 'rm -rf "$D"' EXIT
+R="$(mkdtemp)"
+trap 'rm -rf "$D" "$R"' EXIT
+
+git clone -q --depth=1 file://"$PWD" "$R"
+cd "$R"
-make -s DESTDIR="$D" install
PATH="$D/usr/bin:$PATH"
NODE_PATH="$D/usr/lib/node:$NODE_PATH"
{
+ make -s DESTDIR="$D" install
+
printf '%s: that the papo(3js) library is installed correctly...' \
"$(yellow "$0")"
node -e 'require("papo");'
diff --git a/tests/assert-uninstall.sh b/tests/assert-uninstall.sh
index 82fc86f..0f85a60 100755
--- a/tests/assert-uninstall.sh
+++ b/tests/assert-uninstall.sh
@@ -1,10 +1,21 @@
#!/bin/sh
set -eu
+if [ ! -e .git ]; then
+ echo "Not in a Git repository, skipping \"$0\"." >&2
+ exit
+fi
+
+
. tools/lib.sh
D="$(mkdtemp)"
-trap 'rm -rf "$D"' EXIT
+R="$(mkdtemp)"
+trap 'rm -rf "$D" "$R"' EXIT
+
+git clone -q --depth=1 file://"$PWD" "$R"
+cd "$R"
+
{
make -s DESTDIR="$D" install