Merge pull request #187 from keszybz/semaphore

Semaphore fixes.

Author: keszybz

.gitignore

@@ -5,6 +5,7 @@
 *.pyc
 *.stamp
 *.swp
+.gdb_history
 *~
 /*.tar.bz2
 /*.tar.gz

test/semaphore-run

@@ -1,19 +1,45 @@
-#!/bin/sh
+#!/bin/bash
 # SPDX-License-Identifier: LGPL-2.1+
 
-DEVPKGS="pkg-config liblzma-dev libcurl4-openssl-dev libssl-dev libacl1-dev libfuse-dev zlib1g-dev libzstd-dev libudev-dev"
+DEVPKGS=(
+    pkg-config
+    liblzma-dev
+    libcurl4-openssl-dev
+    libssl-dev
+    libacl1-dev
+    libfuse-dev
+    zlib1g-dev
+    libzstd-dev
+    libudev-dev
+)
 
 echo
 echo "============= Installing amd64 build dependencies =============="
 set -eu
 (
     set -x
-    sudo apt-get install -y software-properties-common
-    sudo add-apt-repository -y ppa:pitti/systemd-semaphore
+
+    sudo rm /etc/apt/sources.list.d/*
+
+    sudo apt install -y software-properties-common
+    sudo add-apt-repository -y ppa:jonathonf/python-3.6
+    sudo add-apt-repository -y ppa:ginggs/backports
+    sudo apt -y update
+    sudo apt -y --no-install-recommends install \
+         python3.6 \
+         squashfs-tools
+
     sudo dpkg --add-architecture i386
     sudo apt-get update
 
-    sudo apt-get install -y $DEVPKGS rsync python3 meson python-sphinx
+    sudo apt -y --no-install-recommends install \
+         rsync \
+         python3-pip \
+         python3-setuptools \
+         python3-wheel \
+         python-sphinx \
+         "${DEVPKGS[@]}"
+    python3.6 -m pip install --user meson ninja
 )
 
 echo
@@ -35,30 +61,30 @@ echo
 echo "============= Running amd64 tests as root =============="
 (
     set -x
-    sudo ninja -C build test
+    sudo CASYNC_TEST_NBD=0 $(which ninja) -C build test
 )
 
 echo
 echo "============= Installing i386 build dependencies =============="
-# help apt to figure out replacing GI dependencies (we don't need them
-# anyway, but a lot of stuff is pre-installed in semaphore)
-(
-    set -x
-    sudo apt-get purge --auto-remove -y python3-gi gir1.2-glib-2.0
-)
 
 # library -dev packages are not co-installable for multiple architectures,
 # so this can't go into the setup step
 (
     set -x
-    sudo apt-get install -y --no-install-recommends gcc-multilib $(echo "$DEVPKGS " | sed 's/\b /:i386 /g')
+    # both arch versions provide /usr/bin/curl-config, which can't go well
+    sudo apt remove -y libcurl4-openssl-dev
+    sudo apt-get install -y --no-install-recommends \
+         gcc-multilib \
+         libgcc-5-dev:i386 \
+         "${DEVPKGS[@]/%/:i386}"
 )
 
 echo
 echo "============= Building i386 =============="
 (
     set -x
-    CFLAGS=-m32 LDFLAGS=-m32 meson build-i386
+    export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu
+    CC=gcc-5 CFLAGS=-m32 LDFLAGS=-m32 meson build-i386
     ninja -C build-i386
 )
 
@@ -73,5 +99,5 @@ echo
 echo "============= Running i386 tests as root =============="
 (
     set -x
-    sudo linux32 ninja -C build-i386 test
+    sudo CASYNC_TEST_NBD=0 linux32 $(which ninja) -C build-i386 test
 )

test/test-cache.sh.in

@@ -4,7 +4,7 @@
 SCRATCH_DIR=${TMPDIR:-/var/tmp}/test-casync.$RANDOM
 mkdir -p $SCRATCH_DIR/src
 
-if [ `id -u` == 0 ] ; then
+if [ $UID = 0 ]; then
     cp -aT @top_srcdir@ $SCRATCH_DIR/src/casync
 else
     # If we lack privileges we use rsync rather than cp to copy, as it will just skip over device nodes
@@ -63,7 +63,7 @@ cmp $SCRATCH_DIR/test4.caidx $SCRATCH_DIR/test5.caidx
 cmp $SCRATCH_DIR/test4.caidx $SCRATCH_DIR/test6.caidx
 cmp $SCRATCH_DIR/test4.caidx $SCRATCH_DIR/test7.caidx
 
-for f in test4 test5 test6 test7 ; do
+for f in test4 test5 test6 test7; do
     @top_builddir@/casync list $SCRATCH_DIR/$f.caidx > $SCRATCH_DIR/$f.list
     @top_builddir@/casync mtree $SCRATCH_DIR/$f.caidx > $SCRATCH_DIR/$f.mtree
     @top_builddir@/casync digest $SCRATCH_DIR/$f.caidx > $SCRATCH_DIR/$f.digest

test/test-fuse.sh.in

@@ -9,7 +9,7 @@ export CASYNC_PROTOCOL_PATH
 SCRATCH_DIR=${TMPDIR:-/var/tmp}/test-casync.$RANDOM
 mkdir -p $SCRATCH_DIR/src
 
-if [ `id -u` == 0 ] ; then
+if [ $UID = 0 ]; then
     cp -a @top_srcdir@ $SCRATCH_DIR/src
 else
     # If we lack privileges we use rsync rather than cp to copy, as it will just skip over device nodes
@@ -28,9 +28,9 @@ diff -q $SCRATCH_DIR/test.digest $SCRATCH_DIR/test.caidx.digest
 
 diff -q $SCRATCH_DIR/test.digest $SCRATCH_DIR/extract.digest
 
-if [ `id -u` == 0 ] ; then
+if [ $UID = 0 ]; then
     modprobe fuse ||:
-    if test -e /dev/fuse ; then
+    if [ -e /dev/fuse ]; then
         MOUNT_PID=`@top_builddir@/notify-wait @top_builddir@/casync $PARAMS mount $SCRATCH_DIR/test.caidx $SCRATCH_DIR/mount`
 
         @top_builddir@/casync $PARAMS digest $SCRATCH_DIR/extract > $SCRATCH_DIR/mount.digest

test/test-nbd.sh.in

@@ -1,16 +1,10 @@
 #!/bin/bash -ex
 # SPDX-License-Identifier: LGPL-2.1+
 
-if [ -z "$1" ] ; then
-    DIGEST=sha512-256
-else
-    DIGEST="$1"
-fi
-
+DIGEST=${1:-sha512-256}
 PARAMS="-v --digest=$DIGEST"
 
-CASYNC_PROTOCOL_PATH=@top_builddir@
-export CASYNC_PROTOCOL_PATH
+export CASYNC_PROTOCOL_PATH=@top_builddir@
 
 SCRATCH_DIR=${TMPDIR:-/var/tmp}/test-casync.$RANDOM
 mkdir -p $SCRATCH_DIR
@@ -35,10 +29,10 @@ diff -q $SCRATCH_DIR/test.digest $SCRATCH_DIR/test.caibx.digest
 diff -q $SCRATCH_DIR/test.digest $SCRATCH_DIR/extract.digest
 diff -q $SCRATCH_DIR/test.digest $SCRATCH_DIR/extract2.digest
 
-if [ `id -u` == 0 ] ; then
+if [ $UID = 0 ]; then
     modprobe nbd ||:
 
-    if test -e /dev/nbd0 ; then
+    if [ -e /dev/nbd0 -a ${CASYNC_TEST_NBD:-1} = 1 ]; then
         MKDEV_PID=`@top_builddir@/notify-wait @top_builddir@/casync $PARAMS mkdev $SCRATCH_DIR/test.caibx $SCRATCH_DIR/test-node`
 
         dd if=$SCRATCH_DIR/test-node bs=102400 count=80 | @top_builddir@/test-calc-digest $DIGEST > $SCRATCH_DIR/mkdev.digest

test/test-script.sh.in

@@ -1,31 +1,20 @@
 #!/bin/bash -ex
 # SPDX-License-Identifier: LGPL-2.1+
 
-if [ -z "$1" ] ; then
-    DIGEST=sha512-256
-else
-    DIGEST="$1"
-fi
+DIGEST=${1:-sha512-256}
+COMPRESSION=${2:-zstd}
 
-if [ -z "$2" ] ; then
-    COMPRESSION=zstd
-else
-    COMPRESSION="$2"
+PARAMS="-v --digest=$DIGEST --compression=$COMPRESSION"
+if [ $UID != 0 ]; then
+    PARAMS="$PARAMS --without=privileged"
 fi
 
-if [ `id -u` == 0 ] ; then
-    PARAMS="-v --digest=$DIGEST --compression=$COMPRESSION"
-else
-    PARAMS="-v --without=privileged --digest=$DIGEST --compression=$COMPRESSION"
-fi
-
-CASYNC_PROTOCOL_PATH=@top_builddir@
-export CASYNC_PROTOCOL_PATH
+export CASYNC_PROTOCOL_PATH=@top_builddir@
 
 SCRATCH_DIR=${TMPDIR:-/var/tmp}/test-casync.$RANDOM
 mkdir -p $SCRATCH_DIR/src
 
-if [ `id -u` == 0 ] ; then
+if [ $UID = 0 ]; then
     cp -aT @top_srcdir@ $SCRATCH_DIR/src/casync
 else
     # If we lack privileges we use rsync rather than cp to copy, as it will just skip over device nodes
@@ -136,11 +125,8 @@ diff -q $SCRATCH_DIR/original-seek.mtree $SCRATCH_DIR/extract-seek-caidx.mtree
 
 ### Test SSH Remoting
 
-CASYNC_SSH_PATH=@top_srcdir@/test/pseudo-ssh
-export CASYNC_SSH_PATH
-
-CASYNC_REMOTE_PATH=@top_builddir@/casync
-export CASYNC_REMOTE_PATH
+export CASYNC_SSH_PATH=@top_srcdir@/test/pseudo-ssh
+export CASYNC_REMOTE_PATH=@top_builddir@/casync
 
 @top_builddir@/casync $PARAMS list localhost:$SCRATCH_DIR/test.caidx > $SCRATCH_DIR/test-remote.caidx.list
 @top_builddir@/casync $PARAMS mtree localhost:$SCRATCH_DIR/test.caidx > $SCRATCH_DIR/test-remote.caidx.mtree
@@ -180,8 +166,7 @@ diff -q $SCRATCH_DIR/test.digest $SCRATCH_DIR/test2.catar.digest
 
 HTTP_PORT=$((10000 + $$ % 10000))
 
-CASYNC_PROTOCOL_PATH=@top_builddir@
-export CASYNC_PROTOCOL_PATH
+export CASYNC_PROTOCOL_PATH=@top_builddir@
 
 HTTP_PID=`@top_builddir@/notify-wait  @top_srcdir@/test/http-server.py $SCRATCH_DIR $HTTP_PORT`