lockbox

commit 3a6e397c3ffc5a927007f442370c1784e6142e79
parent 7f97a217f10a39b499eb729275eb4cbed0c5e079
Author: Sean Enck <sean@ttypty.com>
Date:   Sat, 29 Jul 2023 08:25:58 -0400

better handling of vars env detection

Diffstat:
M
Makefile
 | 
5
+++--
M
tests/run.sh
 | 
1
+

2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,6 +1,7 @@
 BUILD   := bin/
 TARGET  := $(BUILD)lb
 VERSION ?= $(shell git log -n 1 --format=%h)
+VARS    := LOCKBOX_ENV=none
 
 all: $(TARGET)
 
@@ -13,10 +14,10 @@ endif
 	go build $(GOFLAGS) -ldflags "-X main.version=$(VERSION)" -o $@ cmd/main.go
 
 unittests:
-	go test -v ./...
+	$(VARS) go test -v ./...
 
 check: $(TARGET) unittests
-	make -C tests
+	$(VARS) make -C tests
 
 clean:
 	@rm -rf $(BUILD) tests/bin
diff --git a/tests/run.sh b/tests/run.sh
@@ -102,6 +102,7 @@ _config() {
   } > "$ENV"
   _unset
   export LOCKBOX_FAKE_TEST=plain
+  export LOCKBOX_ENV="none"
   ${LB_BINARY} ls
   export LOCKBOX_ENV="$ENV"
   ${LB_BINARY} ls