On CentOS machines which use autoconf version 2.63, the patch
application would fail.
Reported-by: Ian Stokes <ian.sto...@intel.com>
Signed-off-by: Gurucharan Shetty <gshe...@nicira.com>
---
AUTHORS | 1 +
INSTALL.md | 2 --
tests/automake.mk | 13 ++++++++++---
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index a2b4388..8973dec 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -255,6 +255,7 @@ Henrik Amren hen...@nicira.com
Hiroshi Tanaka htan...@nicira.com
Hiroshi Miyata miyahiro.d...@gmail.com
Hyojoon Kim jo...@gatech.edu
+Ian Stokes ian.sto...@intel.com
Igor Ganichev iganic...@nicira.com
Igor Sever i...@xorops.com
Jacob Cherkas jcher...@nicira.com
diff --git a/INSTALL.md b/INSTALL.md
index 8156898..9f8c57e 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 7c699b2..c302a4b 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 $@
+ $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+ patch -p0 $@.tmp $(TESTSUITE_PATCH)
+ $(AM_V_at)mv $@.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
--
1.7.9.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
