Merge branch 'master' into go1.18

.github/workflows/go.yml

@@ -44,13 +44,19 @@ jobs:
 
     - name: Some packages compile for WebAssembly
       run: GOOS=js GOARCH=wasm go build . ./storage ./tracker/...
+      # https://github.com/pion/webrtc/issues/2099
+      continue-on-error: true
 
     - name: Install godo
-      run: go install github.com/anacrolix/godo@latest
+      run: |
+        # Need master for cross-compiling fix
+        go install -v -x github.com/anacrolix/godo@master
+        echo $PATH
 
     - name: Apt packages
       run: sudo apt install pv fuse
 
     - name: torrentfs end-to-end test
-      run: fs/test.sh
+      # Test on 386 for atomic alignment and other bad 64-bit assumptions
+      run: GOARCH=386 fs/test.sh
       timeout-minutes: 10

fs/test.sh

@@ -1,15 +1,17 @@
 set -eux
 repopath="$(cd "$(dirname "$0")/.."; pwd)"
-mkdir -p mnt torrents
-GOPPROF=http go run -v "$repopath/cmd/torrentfs" -mountDir=mnt -metainfoDir=torrents &
-trap 'set +e; sudo umount -f mnt' EXIT
 debian_file=debian-10.8.0-amd64-netinst.iso
+mkdir -p mnt torrents
+# I think the timing can cause torrents to not get added correctly to the torrentfs client, so add
+# them first and start the fs afterwards.
 pushd torrents
 cp "$repopath/testdata/$debian_file.torrent" .
-go run -v -race "$repopath/cmd/torrent" metainfo "$repopath/testdata/sintel.torrent" magnet > sintel.magnet
+godo -v "$repopath/cmd/torrent" metainfo "$repopath/testdata/sintel.torrent" magnet > sintel.magnet
 popd
-file="$debian_file"
-# file=sintel.mp4
+GOPPROF=http godo -v "$repopath/cmd/torrentfs" -mountDir=mnt -metainfoDir=torrents &
+trap 'set +e; sudo umount -f mnt' EXIT
+#file="$debian_file"
+file=Sintel/Sintel.mp4
 while [ ! -e "mnt/$file" ]; do sleep 1; done
 pv -f "mnt/$file" | md5sum
 # expect e221f43f4fdd409250908fc4305727d4