Skip to content

Commit b5de1ba

Browse files
committed
test: skip nbd tests under semaphore
The tests seem to fail because of a race: dd gets 0 bytes from the nbd device. Let's skip this particular test for now.
1 parent 7588a7c commit b5de1ba

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

test/semaphore-run

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ echo
6161
echo "============= Running amd64 tests as root =============="
6262
(
6363
set -x
64-
sudo $(which ninja) -C build test
64+
sudo CASYNC_TEST_NBD=0 $(which ninja) -C build test
6565
)
6666

6767
echo
@@ -99,5 +99,5 @@ echo
9999
echo "============= Running i386 tests as root =============="
100100
(
101101
set -x
102-
sudo linux32 $(which ninja) -C build-i386 test
102+
sudo CASYNC_TEST_NBD=0 linux32 $(which ninja) -C build-i386 test
103103
)

test/test-nbd.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ diff -q $SCRATCH_DIR/test.digest $SCRATCH_DIR/extract2.digest
3232
if [ $UID = 0 ]; then
3333
modprobe nbd ||:
3434

35-
if test -e /dev/nbd0 ; then
35+
if [ -e /dev/nbd0 -a ${CASYNC_TEST_NBD:-1} = 1 ]; then
3636
MKDEV_PID=`@top_builddir@/notify-wait @top_builddir@/casync $PARAMS mkdev $SCRATCH_DIR/test.caibx $SCRATCH_DIR/test-node`
3737

3838
dd if=$SCRATCH_DIR/test-node bs=102400 count=80 | @top_builddir@/test-calc-digest $DIGEST > $SCRATCH_DIR/mkdev.digest

0 commit comments

Comments
 (0)