X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fuse%2Ftest-fuse.sh;h=1accd896fdb359549040a3d380fbc07d2c928a3b;hb=54e91da925323642e67b8ce4b95899fe4b7a51c4;hp=0a429f73b30fa3b649f1c53480064a36875ed223;hpb=0d6fd9e1d2488841c912c5351086e536772837ef;p=libguestfs.git

diff --git a/fuse/test-fuse.sh b/fuse/test-fuse.sh
index 0a429f7..1accd89 100755
--- a/fuse/test-fuse.sh
+++ b/fuse/test-fuse.sh
@@ -14,12 +14,22 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 unset CDPATH
 set -e
 #set -v
 
+if [ ! -w /dev/fuse ]; then
+    echo "SKIPPING guestmount test, because there is no /dev/fuse."
+    exit 0
+fi
+
+if ! setfacl --help >/dev/null 2>&1; then
+    echo "SKIPPING guestmount test, because setfacl is not installed."
+    exit 0
+fi
+
 if [ -z "$top_builddir" ]; then
     echo "$0: error: environment variable \$top_builddir must be set"
     exit 1
@@ -31,6 +41,10 @@ nr_stages=$(grep "^stage " $0 | wc -l)
 # and move to that directory for the initial phase of the script.
 top_builddir=$(cd "$top_builddir" > /dev/null; pwd)
 
+# Set TMPDIR so the appliance doesn't conflict with globally
+# installed libguestfs.
+export TMPDIR=$top_builddir
+
 # Set libguestfs up for running locally.
 export LIBGUESTFS_PATH="$top_builddir/appliance"