Run tests with build directory in PATH

Author: torarnv

Makefile

@@ -150,9 +150,6 @@ FUSE_LDFLAGS := $(shell $(PKG_CONFIG) fuse --libs)
 $(TARGET): sparsebundlefs.o
 	$(CXX) $< -o $@ $(LDFLAGS) $(ARCH_FLAGS) $(FUSE_LDFLAGS)
 
-SPARSEBUNDLEFS=$(abspath $(TARGET))
-export SPARSEBUNDLEFS
-
 TESTS_DIR=$(SRC_DIR)/tests
 TESTDATA_DIR := $(TESTS_DIR)/data
 TEST_BUNDLE := $(TESTDATA_DIR)/test.sparsebundle
@@ -171,7 +168,7 @@ $(TESTDATA_DIR):
 check_%: check ; @:
 check: $(TARGET) $(TESTDATA_DIR)
 	@echo "============== $(PLATFORMS) =============="
-	@$(SRC_DIR)/src/testrunner.sh $(TESTS_DIR)/*.sh \
+	@PATH="$(CURDIR):$(PATH)" $(SRC_DIR)/src/testrunner.sh $(TESTS_DIR)/*.sh \
 		$(subst check_,test_,$(filter check_%,$(ACTUAL_GOALS)))
 
 clean:

tests/10_basic.sh

@@ -1,7 +1,7 @@
 
 function setup() {
     mount_dir=$(mktemp -d)
-    $SPARSEBUNDLEFS -s -f -D $TEST_BUNDLE $mount_dir &
+    sparsebundlefs -s -f -D $TEST_BUNDLE $mount_dir &
     for i in {0..50}; do
         # FIXME: Find actual mount callback in fuse?
         grep -q "bundle has" $test_output_file && break || sleep 0.1

tests/20_allow_other.sh

@@ -1,7 +1,7 @@
 
 function setup() {
     mount_dir=$(mktemp -d)
-    $SPARSEBUNDLEFS -s -f -D -o allow_other $TEST_BUNDLE $mount_dir &
+    sparsebundlefs -s -f -D -o allow_other $TEST_BUNDLE $mount_dir &
     for i in {0..50}; do
         # FIXME: Find actual mount callback in fuse?
         grep -q "bundle has" $test_output_file && break || sleep 0.1