| Message ID | 1483456542-7522-6-git-send-email-abalutoiu@cloudbasesolutions.com |
|---|---|
| State | Superseded |
| Headers | show |
Please ignore this patch, I will send another one soon. Thanks, Alin Balutoiu. > -----Original Message----- > From: Alin Balutoiu > Sent: Tuesday, January 3, 2017 5:17 PM > To: dev@openvswitch.org > Cc: Alin Balutoiu <abalutoiu@cloudbasesolutions.com> > Subject: [PATCH V2 5/5] Python tests: Enable python tests on Windows > > From: Alin Balutoiu <abalutoiu@cloudbasesolutions.com> > > Updated the Readme with additional library required for the python tests. > > Remove the code which disable python tests to be run on Windows. > > Signed-off-by: Alin-Gheorghe Balutoiu <abalutoiu@cloudbasesolutions.com> > --- > V2: Changed code-block from bash to console. > --- > Documentation/intro/install/windows.rst | 7 +++++++ > tests/atlocal.in | 8 -------- > 2 files changed, 7 insertions(+), 8 deletions(-) > > diff --git a/Documentation/intro/install/windows.rst > b/Documentation/intro/install/windows.rst > index 9bd1813..47dd68e 100644 > --- a/Documentation/intro/install/windows.rst > +++ b/Documentation/intro/install/windows.rst > @@ -60,6 +60,13 @@ The following explains the steps in some detail. > > Install the latest Python 2.x from python.org and verify that its path is > part of Windows' PATH environment variable. > + We require that you have Python six and pypiwin32 libraries installed. > + The libraries can be installed via pip command: > + > + .. code-block:: console > + > + $ pip install six > + $ pip install pypiwin32 > > - Visual Studio > > diff --git a/tests/atlocal.in b/tests/atlocal.in index 1353b46..9fbab39 100644 > --- a/tests/atlocal.in > +++ b/tests/atlocal.in > @@ -109,14 +109,6 @@ else > HAVE_IPV6=no > fi > > -# XXX: Disable Python related tests on Windows because Open vSwitch > code -# written in Python has not been ported to the Windows platform. We > will -# need to remove the next block after porting is complete. > -if test "$IS_WIN32" = "yes"; then > - HAVE_PYTHON="no" > - HAVE_PYTHON3="no" > -fi > - > if test "$HAVE_PYTHON" = "yes" \ > && test "x`$PYTHON $abs_top_srcdir/tests/test-l7.py --help | grep 'ftp'`" > != x; then > HAVE_PYFTPDLIB="yes" > -- > 2.10.0.windows.1
diff --git a/Documentation/intro/install/windows.rst b/Documentation/intro/install/windows.rst index 9bd1813..47dd68e 100644 --- a/Documentation/intro/install/windows.rst +++ b/Documentation/intro/install/windows.rst @@ -60,6 +60,13 @@ The following explains the steps in some detail. Install the latest Python 2.x from python.org and verify that its path is part of Windows' PATH environment variable. + We require that you have Python six and pypiwin32 libraries installed. + The libraries can be installed via pip command: + + .. code-block:: console + + $ pip install six + $ pip install pypiwin32 - Visual Studio diff --git a/tests/atlocal.in b/tests/atlocal.in index 1353b46..9fbab39 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -109,14 +109,6 @@ else HAVE_IPV6=no fi -# XXX: Disable Python related tests on Windows because Open vSwitch code -# written in Python has not been ported to the Windows platform. We will -# need to remove the next block after porting is complete. -if test "$IS_WIN32" = "yes"; then - HAVE_PYTHON="no" - HAVE_PYTHON3="no" -fi - if test "$HAVE_PYTHON" = "yes" \ && test "x`$PYTHON $abs_top_srcdir/tests/test-l7.py --help | grep 'ftp'`" != x; then HAVE_PYFTPDLIB="yes"