From caa782960038ee6b86b37ac1440d938b7e4b99ba Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Thu, 23 May 2019 08:40:04 -0400
Subject: [PATCH] Add test for fuse-overlay without mknod

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 contrib/cirrus/build.sh | 22 ++++++++--------------
 contrib/cirrus/lib.sh   | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/contrib/cirrus/build.sh b/contrib/cirrus/build.sh
index b684f8b64..7d9e8e25a 100755
--- a/contrib/cirrus/build.sh
+++ b/contrib/cirrus/build.sh
@@ -6,22 +6,16 @@ source $(dirname $0)/lib.sh
 
 cd $GOSRC
 make install.tools
-echo "Build Binary"
-make local-binary
-echo "local-test-integration Overlay"
-make STORAGE_DRIVER=overlay local-test-integration
-echo "local-test-integration Fuse-overlay"
-make STORAGE_DRIVER=overlay STORAGE_OPTION=overlay.mount_program=/usr/bin/fuse-overlayfs local-test-integration
-echo "local-test-unit"
-make STORAGE_DRIVER=vfs local-test-integration
-echo "local-test-unit"
-make local-test-unit
+showrun make local-binary
+showrun make STORAGE_DRIVER=overlay local-test-integration
+showrun make STORAGE_DRIVER=overlay STORAGE_OPTION=overlay.mount_program=/usr/bin/fuse-overlayfs local-test-integration
+showrun make STORAGE_DRIVER=overlay FUSE_OVERLAYFS_DISABLE_OVL_WHITEOUT=1 STORAGE_OPTION=overlay.mount_program=/usr/bin/fuse-overlayfs local-test-integration
+showrun make STORAGE_DRIVER=vfs local-test-integration
+showrun make local-test-unit
 
 case "$OS_REL_VER" in
     ubuntu-19)
-	echo "local-test-integration Aufs"
-	make STORAGE_DRIVER=aufs local-test-integration
+	showrun make STORAGE_DRIVER=aufs local-test-integration
         ;;
 esac
-#make STORAGE_DRIVER=overlay FUSE_OVERLAYFS_DISABLE_OVL_WHITEOUT=1 STORAGE_OPTION=overlay.mount_program=/usr/bin/fuse-overlayfs local-test-integration
-#make STORAGE_DRIVER=devicemapper STORAGE_OPTION=dm.directlvm_device=/dev/abc local-test-integration
+#showrun make STORAGE_DRIVER=devicemapper STORAGE_OPTION=dm.directlvm_device=/dev/abc local-test-integration
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index 075085621..d545b6c05 100755
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -165,3 +165,17 @@ install_fuse_overlayfs_from_git(){
     sudo make install prefix=/usr
     cd $wd
 }
+
+showrun() {
+    if [[ "$1" == "--background" ]]
+    then
+        shift
+        # Properly escape any nested spaces, so command can be copy-pasted
+        echo '+ '$(printf " %q" "$@")' &' > /dev/stderr
+        "$@" &
+        echo -e "${RED}<backgrounded>${NOR}"
+    else
+        echo '+ '$(printf " %q" "$@") > /dev/stderr
+        "$@"
+    fi
+}