Merge remote-tracking branch 'elladan/master'

.gitignore

@@ -13,3 +13,4 @@ tests/__pycache__/
 
 # dot-files that we don't want to ignore
 !.gitignore
+!.travis.yml

.travis.yml

@@ -0,0 +1,35 @@
+os: linux
+dist: bionic
+language: c
+arch:
+    - amd64
+#   - arm64
+
+addons:
+    apt:
+        packages:
+            - valgrind
+            - python3-pytest
+            - python3-pytest-xdist
+            - meson
+            - ninja-build
+            - pkg-config
+            - libaio-dev
+            - libblkid-dev
+            - libkeyutils-dev
+            - liblz4-dev
+            - libscrypt-dev
+            - libsodium-dev
+            - liburcu-dev
+            - libzstd-dev
+            - uuid-dev
+            - zlib1g-dev
+
+before_install:
+    - wget https://github.com/libfuse/libfuse/archive/fuse-3.7.0.tar.gz -O /tmp/fuse.tar.gz
+    - tar -C /tmp -zxvf /tmp/fuse.tar.gz
+    - mkdir /tmp/libfuse-fuse-3.7.0/build
+    - pushd /tmp/libfuse-fuse-3.7.0/build && meson .. && ninja && sudo ninja install && popd
+    - sudo ldconfig
+
+script: ./smoke_test

Makefile

@@ -71,8 +71,11 @@ endif
 .PHONY: all
 all: bcachefs
 
+.PHONY: tests
+tests: tests/test_helper
+
 .PHONY: check
-check: tests/test_helper bcachefs
+check: tests bcachefs
 	cd tests; $(PYTEST)
 
 .PHONY: TAGS tags

smoke_test

@@ -0,0 +1,82 @@
+#!/bin/bash
+#
+# This is a smoke test of bcachefs-tools.
+#
+# It builds the source with multiple options (debug, release, valgrind, FUSE)
+# and runs the test suite.
+#
+# Returns 0 on success, nonzero on any failure.
+#
+# Dependencies:
+#
+# valgrind, python3-pytest, python3-pytest-xdist
+#
+# On debian/ubuntu based systems, install with:
+#
+#   apt install valgrind python3-pytest python3-pytest-xdist
+#
+# You also currently need fuse 3.7 or later.  Fuse 3.7 unfortunately requires
+# debian sid or bullseye at this time, so you may need to install from source.
+
+set -e
+
+spam=$(tempfile)
+unset BCACHEFS_FUSE BCACHEFS_TEST_USE_VALGRIND D
+
+trap "set +x; cat ${spam}; rm -f ${spam} ; echo; echo FAILED." EXIT
+
+echo -- Verify dependencies --
+pkg-config --atleast-version 3.7.0 fuse3
+python3 -c "import pytest"
+python3 -c "import xdist"
+which valgrind > /dev/null
+echo OK
+
+JOBS=$(nproc)
+function build() {
+    echo Building.
+    make -j ${JOBS} clean          > ${spam} 2>&1
+    make -j ${JOBS} tests bcachefs > ${spam} 2>&1
+    truncate -s0 ${spam}
+}
+
+function test() {
+    echo Running tests.
+    (
+        cd tests
+        pytest-3 -n${JOBS}
+    ) > ${spam} 2>&1
+}
+
+function test_vg() {
+    echo Running tests with valgrind.
+    (
+        export BCACHEFS_TEST_USE_VALGRIND=yes
+        cd tests
+        pytest-3 -n${JOBS}
+    ) > ${spam} 2>&1
+}
+
+
+echo -- Test: default --
+build
+test    
+
+echo -- Test: debug --
+export D=1
+build
+test
+
+echo -- Test: debug with valgrind --
+test_vg
+
+echo -- Test: fuse debug --
+export BCACHEFS_FUSE=1
+build
+test
+
+echo -- Test: fuse debug with valgrind --
+test_vg
+
+rm -f ${spam}
+trap "set +x; echo; echo SUCCESS." EXIT

tests/test_fuse.py

@@ -230,3 +230,6 @@ def test_write(bfuse):
     assert ts.contains(post_st.st_mtime)
 
     assert path.read_bytes() == b'test'
+
+    bfuse.unmount()
+    bfuse.verify()

tests/util.py

@@ -22,10 +22,14 @@ class ValgrindFailedError(Exception):
     def __init__(self, log):
         self.log = log
 
-def check_valgrind(logfile):
+def check_valgrind(log):
-    log = logfile.read().decode('utf-8')
     m = VPAT.search(log)
-    assert m is not None, 'Internal error: valgrind log did not match.'
+    if m is None:
+        print('Internal error: valgrind log did not match.')
+        print('-- valgrind log:')
+        print(log)
+        print('-- end log --')
+        assert False
 
     errors = int(m.group(1))
     if errors > 0:
@@ -53,7 +57,7 @@ def run(cmd, *args, valgrind=False, check=False):
                          encoding='utf-8', check=check)
 
     if valgrind:
-        check_valgrind(vout)
+        check_valgrind(vout.read().decode('utf-8'))
 
     return res
 
@@ -150,14 +154,14 @@ class BFuse:
     def run(self):
         """Background thread which runs "bcachefs fusemount" under valgrind"""
 
-        vout = None
+        vlog = None
         cmd = []
 
         if ENABLE_VALGRIND:
-            vout = tempfile.NamedTemporaryFile()
+            vlog = tempfile.NamedTemporaryFile()
             cmd += [ 'valgrind',
                      '--leak-check=full',
-                     '--log-file={}'.format(vout.name) ]
+                     '--log-file={}'.format(vlog.name) ]
 
         cmd += [ BCH_PATH,
                  'fusemount', '-f', self.dev, self.mnt]
@@ -178,7 +182,7 @@ class BFuse:
         self.stdout = out1 + out2
         self.stderr = err.read()
         self.returncode = self.proc.returncode
-        self.vout = vout
+        self.vout = vlog.read().decode('utf-8')
 
     def expect(self, pipe, regex):
         """Wait for the child process to mount."""
@@ -208,13 +212,15 @@ class BFuse:
     def unmount(self, timeout=None):
         print("Unmounting fuse.")
         run("fusermount3", "-zu", self.mnt)
-        print("Waiting for thread to exit.")
 
         if self.thread:
+            print("Waiting for thread to exit.")
             self.thread.join(timeout)
             if self.thread.is_alive():
                 self.proc.kill()
                 self.thread.join()
+        else:
+            print("Thread was already done.")
 
         self.thread = None
         self.ready.clear()

tools-util.c

@@ -31,7 +31,7 @@ void die(const char *fmt, ...)
 	va_end(args);
 	fputc('\n', stderr);
 
-	exit(EXIT_FAILURE);
+	_exit(EXIT_FAILURE);
 }
 
 char *mprintf(const char *fmt, ...)