Use hfsfuse to test correctness of sparsebundlefs

Author: torarnv

.gitignore

@@ -1,3 +1,5 @@
 sparsebundlefs
+hfsdump
+hfsfuse
 *.o
 *.dSYM

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "hfsfuse"]
+	path = src/3rdparty/hfsfuse
+	url = https://github.com/0x09/hfsfuse.git

Dockerfile.linux-gcc

@@ -6,6 +6,7 @@ RUN dpkg --add-architecture $arch && \
 	apt-get update && \
 	apt-get install -y \
 		build-essential \
+		git \
 		g++-multilib \
 		pkg-config:$arch \
 		libfuse-dev:$arch \

Makefile

@@ -150,30 +150,44 @@ FUSE_LDFLAGS := $(shell $(PKG_CONFIG) fuse --libs)
 $(TARGET): sparsebundlefs.o
 	$(CXX) $< -o $@ $(LDFLAGS) $(ARCH_FLAGS) $(FUSE_LDFLAGS)
 
+HFSFUSE_DIR := $(SRC_DIR)/src/3rdparty/hfsfuse
+HFSFUSE_DEPS := $(shell find $(HFSFUSE_DIR))
+export HFSFUSE_DIR
+
+hfsfuse: $(HFSFUSE_DEPS)
+	$(if $(wildcard $(HFSFUSE_DIR)/.git),,$(error Please init and update git submodules))
+	$(call ensure_binary,git)
+	@printf "Building hfsfuse... "
+	@tmpdir=$$(mktemp -d); GIT_DIR=$(HFSFUSE_DIR)/.git GIT_WORK_TREE=$$tmpdir git checkout . \
+		&& make -C $$tmpdir CFLAGS="$(ARCH_FLAGS) -D_FILE_OFFSET_BITS=64" LDFLAGS=$(ARCH_FLAGS) >/dev/null 2>&1 \
+		&& cp $$tmpdir/hfsfuse $(CURDIR) && cp $$tmpdir/hfsdump $(CURDIR) \
+		&& printf "OK\n" && rm -Rf $$tmpdir
+
 TESTS_DIR=$(SRC_DIR)/tests
 TESTDATA_DIR := $(TESTS_DIR)/data
-TEST_BUNDLE := $(TESTDATA_DIR)/test.sparsebundle
-export TEST_BUNDLE
+$(TESTDATA_DIR):
+	@mkdir $(TESTDATA_DIR)
 
-ifneq ($(filter testdata,$(ACTUAL_GOALS)),)
-.PHONY:: testdata
-endif
+TEST_BUNDLE := $(TESTDATA_DIR)/basic.sparsebundle
+export TEST_BUNDLE
 
-vpath $(TESTDATA_DIR) $(SRC_DIR)
-$(TESTDATA_DIR):
+$(TEST_BUNDLE): $(TESTDATA_DIR) $(HFSFUSE_DEPS)
 	$(call ensure_binary,hdiutil)
-	@rm -Rf $(TESTDATA_DIR) && mkdir $(TESTDATA_DIR)
-	hdiutil create -size 1TB -type SPARSEBUNDLE -layout NONE -fs HFS+ $(TEST_BUNDLE)
+	@test ! -e $@ || rm -Rf $@
+	@printf "Creating testdata..." \
+		&& hdiutil create -size 1TB -format SPARSEBUNDLE -layout NONE \
+			-fs HFS+ -srcfolder $(HFSFUSE_DIR) $@
 
 check_%: check ; @:
-check: $(TARGET) $(TESTDATA_DIR)
+check: $(TARGET) $(TEST_BUNDLE) hfsfuse
 	@echo "============== $(PLATFORMS) =============="
 	@PATH="$(CURDIR):$(PATH)" $(SRC_DIR)/tests/testrunner.sh $(TESTS_DIR)/*.tst \
 		$(subst check_,test_,$(filter check_%,$(ACTUAL_GOALS)))
 
 clean:
 	rm -f $(TARGET)
 	rm -Rf $(TARGET).dSYM
+	rm -f hfsfuse hfsdump
 	rm -f *.o
 
 distclean: clean

src/3rdparty/hfsfuse

@@ -0,0 +1,23 @@
+#!/usr/bin/env testrunner.sh
+
+source "$(dirname "$0")/testhelpers.sh"
+
+function setup() {
+    mount_sparsebundle
+}
+
+function test_dmg_has_correct_number_of_blocks() {
+    hfsdump $dmg_file | grep "total_blocks: 268435456"
+}
+
+function test_dmg_contents_is_same_as_testdata() {
+	for f in $(ls $HFSFUSE_DIR/src); do
+		echo "Diffing $HFSFUSE_DIR/src/$f"
+		diff $HFSFUSE_DIR/src/$f <(hfsdump $dmg_file read "/src/$f")
+	done
+}
+
+function teardown() {
+    umount $mount_dir
+    rm -Rf $mount_dir
+}