[ovs-dev] [PATCH] tests: Automatically add pthread-win32 directory to $PATH.

[Ben Pfaff]

OK, I'll drop it, though if anyone else wants to pick up and fix it that
would be fine too.

On Thu, Jun 25, 2015 at 02:26:36PM +0000, Alin Serdean wrote:
> I tested it and there are two problems with it:
> 
> -	PTHREAD_WIN32_DIR is not the actual location of the DLLs the actual path would be of the form
>                PTHREAD_WIN32_DIR_DLL=$withval/dll/x86
> 
> -	$withval/lib/x86(PTHREAD_WIN32_DIR) is of the windows form: C:/pthread/dll/x86, while mingw
>                expects it to be of the form /C/pthread/dll/x86
> 
> Alin.
> 
> -----Mesaj original-----
> De la: dev [mailto:dev-bounces at openvswitch.org] În numele Ben Pfaff
> Trimis: Thursday, June 25, 2015 5:14 AM
> Către: dev at openvswitch.org
> Cc: Ben Pfaff
> Subiect: [ovs-dev] [PATCH] tests: Automatically add pthread-win32 directory to $PATH.
> 
> This reduces the user burden for running "make check".
> 
> Signed-off-by: Ben Pfaff <blp at nicira.com>
> ---
> I can't test this; whoever reviews it ought to.
> 
>  m4/openvswitch.m4 | 6 ++++--
>  tests/automake.mk | 2 +-
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 index f89cde0..57df79e 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_INCLUDES="-I$withval/include"
> -            PTHREAD_LDFLAGS="-L$withval/lib/x86"
> +            PTHREAD_WIN32_DIR=$withval/lib/x86
> +            PTHREAD_INCLUDES=-I$withval/include
> +            PTHREAD_LDFLAGS=-L$PTHREAD_WIN32_DIR
>              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)
> --
> 2.1.3
> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev