From: Christoph Jaeger Date: Mon, 26 Jan 2015 16:26:12 +0000 (-0500) Subject: autotest: Use modprobe for kernel module unloading X-Git-Tag: v2.12.3~7468 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=95bad473da71b36cca86553c3d5a71138f06c55a;p=mirror_ovs.git autotest: Use modprobe for kernel module unloading rmmod fails if the module is not loaded; thus, Vagrant aborts provisioning when started from a clean slate. Use modprobe, which does not fail, instead. Unloading unused modules the to-be-unloaded module depends on may also be desirable. Signed-off-by: Christoph Jaeger Signed-off-by: Andy Zhou --- diff --git a/tests/automake.mk b/tests/automake.mk index 1fe0799e9..2dfaff11a 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -188,7 +188,7 @@ check-kernel: all tests/atconfig tests/atlocal $(KMOD_TESTSUITE) # Testing the out of tree Kernel module check-kmod: all tests/atconfig tests/atlocal $(KMOD_TESTSUITE) $(MAKE) modules_install - rmmod openvswitch + modprobe -r openvswitch $(MAKE) check-kernel clean-local: