[ovs-dev,ovn,v2] tests: Fix check-valgrind and check-lcov.
diff mbox series

Message ID 1571708299-8191-1-git-send-email-hzhou@ovn.org
State New
Headers show
Series
  • [ovs-dev,ovn,v2] tests: Fix check-valgrind and check-lcov.
Related show

Commit Message

Han Zhou Oct. 22, 2019, 1:38 a.m. UTC
After split from OVS, make check-valgrind and check-lcov are not
working any more, because the $ovs_srcdir are missing for these tests.
Instead of add ovs_srcdir=$(ovs_srcdir) for each target, this patch
export ovs_srcdir once for all.

Signed-off-by: Han Zhou <hzhou@ovn.org>
---
 tests/automake.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Numan Siddique Oct. 22, 2019, 6:28 a.m. UTC | #1
On Tue, Oct 22, 2019 at 7:08 AM Han Zhou <hzhou@ovn.org> wrote:

> After split from OVS, make check-valgrind and check-lcov are not
> working any more, because the $ovs_srcdir are missing for these tests.
> Instead of add ovs_srcdir=$(ovs_srcdir) for each target, this patch
> export ovs_srcdir once for all.
>
> Signed-off-by: Han Zhou <hzhou@ovn.org>
>

Acked-by: Numan Siddique <numans@ovn.org>

Numan


> ---
>  tests/automake.mk | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/tests/automake.mk b/tests/automake.mk
> index 013e592..47e6a5d 100644
> --- a/tests/automake.mk
> +++ b/tests/automake.mk
> @@ -54,8 +54,10 @@ DISTCLEANFILES += tests/atconfig tests/atlocal
>
>  AUTOTEST_PATH =
> $(ovs_builddir)/utilities:$(ovs_builddir)/vswitchd:$(ovs_builddir)/ovsdb:$(ovs_builddir)/vtep:tests:$(PTHREAD_WIN32_DIR_DLL):$(SSL_DIR):controller-vtep:northd:utilities:controller
>
> +export ovs_srcdir
> +
>  check-local:
> -       set $(SHELL) '$(TESTSUITE)' -C tests
> AUTOTEST_PATH=$(AUTOTEST_PATH) ovs_srcdir=$(ovs_srcdir); \
> +       set $(SHELL) '$(TESTSUITE)' -C tests
> AUTOTEST_PATH=$(AUTOTEST_PATH); \
>         "$$@" $(TESTSUITEFLAGS) || (test X'$(RECHECK)' = Xyes && "$$@"
> --recheck)
>
>  # Python Coverage support.
> --
> 2.1.0
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
Han Zhou Oct. 22, 2019, 8:09 p.m. UTC | #2
On Mon, Oct 21, 2019 at 11:28 PM Numan Siddique <numans@ovn.org> wrote:
>
>
>
> On Tue, Oct 22, 2019 at 7:08 AM Han Zhou <hzhou@ovn.org> wrote:
>>
>> After split from OVS, make check-valgrind and check-lcov are not
>> working any more, because the $ovs_srcdir are missing for these tests.
>> Instead of add ovs_srcdir=$(ovs_srcdir) for each target, this patch
>> export ovs_srcdir once for all.
>>
>> Signed-off-by: Han Zhou <hzhou@ovn.org>
>
>
> Acked-by: Numan Siddique <numans@ovn.org>
>
> Numan
>
Thanks! I applied this to master.

Patch
diff mbox series

diff --git a/tests/automake.mk b/tests/automake.mk
index 013e592..47e6a5d 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -54,8 +54,10 @@  DISTCLEANFILES += tests/atconfig tests/atlocal
 
 AUTOTEST_PATH = $(ovs_builddir)/utilities:$(ovs_builddir)/vswitchd:$(ovs_builddir)/ovsdb:$(ovs_builddir)/vtep:tests:$(PTHREAD_WIN32_DIR_DLL):$(SSL_DIR):controller-vtep:northd:utilities:controller
 
+export ovs_srcdir
+
 check-local:
-	set $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) ovs_srcdir=$(ovs_srcdir); \
+	set $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH); \
 	"$$@" $(TESTSUITEFLAGS) || (test X'$(RECHECK)' = Xyes && "$$@" --recheck)
 
 # Python Coverage support.