containers
/
storage
mirror of https://github.com/containers/storage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #354 from rhatdan/test 

Add test for fuse-overlay without mknod
This commit is contained in:
Giuseppe Scrivano 2019-05-24 12:47:02 +02:00 committed by GitHub
parent 181b27344b caa7829600
commit f01efbad8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
contrib/cirrus/build.sh
View File

@ -6,22 +6,16 @@ source $(dirname $0)/lib.sh
cd $GOSRC cd $GOSRC
make install.tools make install.tools
echo "Build Binary" showrun make local-binary
make local-binary showrun make STORAGE_DRIVER=overlay local-test-integration
echo "local-test-integration Overlay" showrun make STORAGE_DRIVER=overlay STORAGE_OPTION=overlay.mount_program=/usr/bin/fuse-overlayfs local-test-integration
make STORAGE_DRIVER=overlay 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
echo "local-test-integration Fuse-overlay" showrun make STORAGE_DRIVER=vfs local-test-integration
make STORAGE_DRIVER=overlay STORAGE_OPTION=overlay.mount_program=/usr/bin/fuse-overlayfs local-test-integration showrun make local-test-unit
echo "local-test-unit"
make STORAGE_DRIVER=vfs local-test-integration
echo "local-test-unit"
make local-test-unit
case "$OS_REL_VER" in case "$OS_REL_VER" in
ubuntu-19) ubuntu-19)
echo "local-test-integration Aufs" showrun make STORAGE_DRIVER=aufs local-test-integration
make STORAGE_DRIVER=aufs local-test-integration
;; ;;
esac esac
#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=devicemapper STORAGE_OPTION=dm.directlvm_device=/dev/abc local-test-integration
#make STORAGE_DRIVER=devicemapper STORAGE_OPTION=dm.directlvm_device=/dev/abc local-test-integration

14
contrib/cirrus/lib.sh
View File

@ -165,3 +165,17 @@ install_fuse_overlayfs_from_git(){
sudo make install prefix=/usr sudo make install prefix=/usr
cd $wd 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
}