On Wed, Jun 24, 2015 at 07:43:03AM -0700, Gurucharan Shetty wrote:
> On Tue, Jun 23, 2015 at 6:11 PM, Alin Serdean
> <[email protected]> wrote:
> > How about the following:
> >
> > Before running the unit tests make sure to add the pthread libraries to your
> > PATH environment variable.
> The above is already part of the documentation with the following wording:
>
> You should add the pthread-win32's dll
> path (e.g.: C:\pthread\dll\x86) to the Windows' PATH environment variable.
>
> So why repeat it?
Can we just fix this, instead of making users deal with it, with
something like this?
diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4
index f89cde0..18d874a 100644
--- a/m4/openvswitch.m4
+++ b/m4/openvswitch.m4
@@ -86,9 +86,11 @@ AC_DEFUN([OVS_CHECK_WIN32],
AC_MSG_ERROR([Invalid --with-pthread value])
;;
*)
+ PTHREAD_WIN32_DIR=$withval/lib/x86
PTHREAD_INCLUDES="-I$withval/include"
PTHREAD_LDFLAGS="-L$withval/lib/x86"
PTHREAD_LIBS="-lpthreadVC2"
+ AC_SUBST([PTHREAD_WIN32_DIR])
AC_SUBST([PTHREAD_INCLUDES])
AC_SUBST([PTHREAD_LDFLAGS])
AC_SUBST([PTHREAD_LIBS])
diff --git a/tests/automake.mk b/tests/automake.mk
index 3f57114..714bc91 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -95,7 +95,7 @@ TESTSUITE_PATCH = $(srcdir)/tests/testsuite.patch
KMOD_TESTSUITE = $(srcdir)/tests/kmod-testsuite
DISTCLEANFILES += tests/atconfig tests/atlocal
-AUTOTEST_PATH = utilities:vswitchd:ovsdb:vtep:tests
+AUTOTEST_PATH = utilities:vswitchd:ovsdb:vtep:tests:$(PTHREAD_WIN32_DIR)
check-local: tests/atconfig tests/atlocal $(TESTSUITE)
$(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH)
$(TESTSUITEFLAGS)
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
