From f6c78451163bba2e1bbc607753872a432d180d70 Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Tue, 2 Aug 2016 01:31:59 +0200 Subject: [PATCH] testsuite/Makefile: convert now needs -version. New wireless interface name: wlp13s0. --- testsuite/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testsuite/Makefile b/testsuite/Makefile index 5c57db2d..f267a0d5 100644 --- a/testsuite/Makefile +++ b/testsuite/Makefile @@ -34,7 +34,7 @@ prereqlocal: installparallel tcsh -c echo tcsh installed || (echo tcsh is required for testsuite; /bin/false) seq 1 2 >/dev/null || (echo seq is required for testsuite; /bin/false) stdout echo || (echo stdout is required for testsuite; /bin/false) - convert >/dev/null || (echo convert is required for testsuite; /bin/false) + convert -version >/dev/null || (echo convert is required for testsuite; /bin/false) echo 1+2 | bc >/dev/null || (echo bc is required for testsuite; /bin/false) echo | gawk '{print "gawk is installed"}' || (echo gawk is required for testsuite; /bin/false) expect -c 'spawn cat; puts "expect is installed"' || (echo expect is required for testsuite; /bin/false) @@ -53,7 +53,7 @@ prereqremote: installparallel startvm startvm: # Make sure we can reach the virtual machines - sudo ifconfig wlan0:0 192.168.1.72 + sudo ifconfig wlp13s0:0 192.168.1.72 || sudo ifconfig wlan0:0 192.168.1.72 # If they are already running: Don't fail VBoxManage startvm CentOS3-root:centos3 || VBoxManage controlvm CentOS3-root:centos3 resume || true VBoxManage startvm RedHat9-root:redhat9 || VBoxManage controlvm RedHat9-root:redhat9 resume || true