From: Gurucharan Shetty Date: Thu, 23 Apr 2015 14:13:04 +0000 (-0700) Subject: testsuite: Don't apply the testsuite.patch on non-Windows platforms. X-Git-Tag: v2.4.0~276 X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=83e09b5dfa35b95e9995713bdfcb9a27f9b4ed7f testsuite: Don't apply the testsuite.patch on non-Windows platforms. On CentOS machines which use autoconf version 2.63, the patch application would fail. Reported-by: Ian Stokes Tested-by: Ian Stokes Signed-off-by: Gurucharan Shetty --- diff --git a/AUTHORS b/AUTHORS index a2b43886e..8973decb8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -255,6 +255,7 @@ Henrik Amren henrik@nicira.com Hiroshi Tanaka htanaka@nicira.com Hiroshi Miyata miyahiro.dazu@gmail.com Hyojoon Kim joonk@gatech.edu +Ian Stokes ian.stokes@intel.com Igor Ganichev iganichev@nicira.com Igor Sever igor@xorops.com Jacob Cherkas jcherkas@nicira.com diff --git a/INSTALL.md b/INSTALL.md index 81568987d..9f8c57eb6 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -45,8 +45,6 @@ you will need the following software: - Python 2.x, for x >= 4. - - patch (The utility that is used to patch files). - On Linux, you may choose to compile the kernel module that comes with the Open vSwitch distribution or to use the kernel module built into the Linux kernel (version 3.3 or later). See the [FAQ.md] question diff --git a/tests/automake.mk b/tests/automake.mk index 7c699b292..e63fb19ff 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -200,10 +200,17 @@ clean-local: test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' -C tests --clean AUTOTEST = $(AUTOM4TE) --language=autotest + +if WIN32 $(TESTSUITE): package.m4 $(TESTSUITE_AT) $(COMMON_MACROS_AT) $(TESTSUITE_PATCH) $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' -o testsuite.tmp $@.at patch -p0 testsuite.tmp $(TESTSUITE_PATCH) $(AM_V_at)mv testsuite.tmp $@ +else +$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(COMMON_MACROS_AT) + $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at + $(AM_V_at)mv $@.tmp $@ +endif $(KMOD_TESTSUITE): package.m4 $(KMOD_TESTSUITE_AT) $(COMMON_MACROS_AT) $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at