lockbox

commit 262d6400823b35ea33d5bfcf556ef0996d1cf52b
parent 20d45a34f368a7e20a1d8bf91a81eae75a057cee
Author: Sean Enck <sean@ttypty.com>
Date:   Sun, 12 Mar 2023 10:32:46 -0400

be able to run tests independently

Diffstat:
M
Makefile
 | 
2
+-
A
tests/Makefile
 | 
6
++++++
M
tests/run.sh
 | 
44
+++++++++++++++++++++++++-------------------

3 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ unittests:
 	go test -v ./...
 
 check: $(TARGET) unittests
-	cd tests && ./run.sh
+	make -C tests
 
 clean:
 	rm -rf $(BUILD)
diff --git a/tests/Makefile b/tests/Makefile
@@ -0,0 +1,6 @@
+TESTS := password keyfile
+
+all: $(TESTS)
+
+$(TESTS):
+	./run.sh $@
diff --git a/tests/run.sh b/tests/run.sh
@@ -96,11 +96,6 @@ _clipboard() {
   echo "clipboard test failed"
 }
 
-_cleanup() {
-  mkdir -p "$DATA"
-  find "$DATA" -type f -delete
-}
-
 _logtest() {
   _execute 2>&1 | \
     sed 's/modtime: [0-9].*$/modtime: XXXX-XX-XX/g' | \
@@ -110,8 +105,6 @@ _logtest() {
 _evaluate() {
   local logfile
   logfile="$DATA/actual.log"
-  echo "$1"
-  echo "============"
   _logtest > "$logfile"
   if ! diff -u "$logfile" "expected.log"; then
     echo "failed"
@@ -120,16 +113,29 @@ _evaluate() {
   echo "passed"
 }
 
-_run() {
-  export LOCKBOX_KEYFILE=""
-  _cleanup
-  _evaluate "password"
-  echo
-  _cleanup
-  KEYFILE="$DATA/test.key"
-  echo "thisisatest" > "$KEYFILE"
-  export LOCKBOX_KEYFILE="$KEYFILE"
-  _evaluate "keyfile"
-}
+if [ -z "$1" ]; then
+  echo "no test given"
+  exit 1
+fi
+echo "$1"
+echo "============"
+
+mkdir -p "$DATA"
+find "$DATA" -type f -delete
 
-_run
+case "$1" in
+  "password")
+    export LOCKBOX_KEYFILE=""
+    _evaluate
+    ;;
+  "keyfile")
+    KEYFILE="$DATA/test.key"
+    echo "thisisatest" > "$KEYFILE"
+    export LOCKBOX_KEYFILE="$KEYFILE"
+    _evaluate
+    ;;
+  *)
+    echo "unknown test: $1"
+    exit 1
+    ;;
+esac