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 <[email protected]> Tested-by: Ian Stokes <[email protected]> Signed-off-by: Gurucharan Shetty <[email protected]>
mengxiang0811 · Apr 23, 2015 · 83e09b5 · 83e09b5
1 parent 1b99bb0
commit 83e09b5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -255,6 +255,7 @@ Henrik Amren            [email protected]
 Hiroshi Tanaka          [email protected]
 Hiroshi Miyata          [email protected]
 Hyojoon Kim             [email protected]
+Ian Stokes              [email protected]
 Igor Ganichev           [email protected]
 Igor Sever              [email protected]
 Jacob Cherkas           [email protected]

diff --git 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
@@ -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