Don't crash if valgrind or libtool are not installed.

diff --git a/test/util.py b/test/util.py
index 5f2f3e0ec696e1fa029d2e92f7d8c8ccf1d9569a..e8bb9c2c1ee78b5b80d9d97db23bae134a5d0add 100644 (file)
--- a/test/util.py
+++ b/test/util.py
@@ -40,9 +40,13 @@ def umount(mount_process, mnt_dir):
 
 # If valgrind and libtool are available, use them
 def has_program(name):
-    return subprocess.call([name, '--version'],
-                           stdout=subprocess.DEVNULL,
-                           stderr=subprocess.DEVNULL) == 0
+    try:
+        ret = subprocess.call([name, '--version'],
+                              stdout=subprocess.DEVNULL,
+                              stderr=subprocess.DEVNULL)
+    except FileNotFoundError:
+        return False
+    return ret == 0
 
 if has_program('valgrind') and has_program('libtool'):
     base_cmdline = [ 'libtool', '--mode=execute',