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 <ian.stokes@intel.com>
Tested-by: Ian Stokes <ian.stokes@intel.com>
Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>

diff --git a/AUTHORS b/AUTHORS
index a2b4388..8973dec 100644 (file)
--- 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 8156898..9f8c57e 100644 (file)
--- 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 7c699b2..e63fb19 100644 (file)
--- 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