| Message ID | 1462315455-33810-1-git-send-email-joe@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, May 3, 2016 at 3:44 PM, Joe Stringer <joe@ovn.org> wrote: > The make check-kmod target would previously attempt to only remove the > openvswitch module, which would fail if any vport modules were loaded. > Remove those modules too, to allow the target to proceed. > > Signed-off-by: Joe Stringer <joe@ovn.org> > --- > tests/automake.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/automake.mk b/tests/automake.mk > index 0b77617e5081..a5c60741ce98 100644 > --- a/tests/automake.mk > +++ b/tests/automake.mk > @@ -230,7 +230,7 @@ check-kernel: all tests/atconfig tests/atlocal > $(SYSTEM_KMOD_TESTSUITE) > # Testing the out of tree Kernel module > check-kmod: all tests/atconfig tests/atlocal $(SYSTEM_KMOD_TESTSUITE) > $(MAKE) modules_install > - modprobe -r openvswitch > + modprobe -r -a vport-geneve vport-gre vport-lisp vport-stt > vport-vxlan openvswitch > $(MAKE) check-kernel > > check-system-userspace: all tests/atconfig tests/atlocal > $(SYSTEM_USERSPACE_TESTSUITE) > I am not sure if '-a' is required here, but it should not cause problem either. Acked-by: Andy Zhou <azhou@ovn.org> -- > 2.1.4 > >
On 4 May 2016 at 11:29, Andy Zhou <azhou@ovn.org> wrote: > > > On Tue, May 3, 2016 at 3:44 PM, Joe Stringer <joe@ovn.org> wrote: >> >> The make check-kmod target would previously attempt to only remove the >> openvswitch module, which would fail if any vport modules were loaded. >> Remove those modules too, to allow the target to proceed. >> >> Signed-off-by: Joe Stringer <joe@ovn.org> >> --- >> tests/automake.mk | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/tests/automake.mk b/tests/automake.mk >> index 0b77617e5081..a5c60741ce98 100644 >> --- a/tests/automake.mk >> +++ b/tests/automake.mk >> @@ -230,7 +230,7 @@ check-kernel: all tests/atconfig tests/atlocal >> $(SYSTEM_KMOD_TESTSUITE) >> # Testing the out of tree Kernel module >> check-kmod: all tests/atconfig tests/atlocal $(SYSTEM_KMOD_TESTSUITE) >> $(MAKE) modules_install >> - modprobe -r openvswitch >> + modprobe -r -a vport-geneve vport-gre vport-lisp vport-stt >> vport-vxlan openvswitch >> $(MAKE) check-kernel >> >> check-system-userspace: all tests/atconfig tests/atlocal >> $(SYSTEM_USERSPACE_TESTSUITE) > > > I am not sure if '-a' is required here, but it should not cause problem > either. I'm not 100% sure either, but the commandline output certainly differs between the two; with -a it will print errors for each failure, whereas without it seems to only print 1 error. > Acked-by: Andy Zhou <azhou@ovn.org> Thanks, applied.
diff --git a/tests/automake.mk b/tests/automake.mk index 0b77617e5081..a5c60741ce98 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -230,7 +230,7 @@ check-kernel: all tests/atconfig tests/atlocal $(SYSTEM_KMOD_TESTSUITE) # Testing the out of tree Kernel module check-kmod: all tests/atconfig tests/atlocal $(SYSTEM_KMOD_TESTSUITE) $(MAKE) modules_install - modprobe -r openvswitch + modprobe -r -a vport-geneve vport-gre vport-lisp vport-stt vport-vxlan openvswitch $(MAKE) check-kernel check-system-userspace: all tests/atconfig tests/atlocal $(SYSTEM_USERSPACE_TESTSUITE)
The make check-kmod target would previously attempt to only remove the openvswitch module, which would fail if any vport modules were loaded. Remove those modules too, to allow the target to proceed. Signed-off-by: Joe Stringer <joe@ovn.org> --- tests/automake.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)