[ovs-git] Open vSwitch: testsuite.at: Workaround for carriage returns on windows. (master)
dev at openvswitch.org
dev at openvswitch.org
Tue Apr 22 23:03:13 UTC 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".
The branch, master has been updated
via 0d21340a5a1e26bba46522ba4666033564f8e930 (commit)
via b3c3eec7195a86e343b58e52601c5ab676e07a0b (commit)
via 038b21a100dd346a7e1fbf833284e1d58949e7cb (commit)
via a9e9db79e7e6cdcb195e91c431c4a335b72b14da (commit)
via 4ec4776c69d44acb3379e663ca700fd7ab3aecb2 (commit)
via 69b17834a47300d13e86c680f03800d107ab9b1e (commit)
via e3f512b07c11de6b297050bb969fd0d8a07f9357 (commit)
via c7c1bdf355d8885a61363f39a759baa96621f0f2 (commit)
from 882470607bdbaec5a1252f34cf97f4b4ef000d21 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0d21340a5a1e26bba46522ba4666033564f8e930
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=0d21340a5a1e26bba46522ba4666033564f8e930
Author: Gurucharan Shetty <gshetty at nicira.com>
testsuite.at: Workaround for carriage returns on windows.
In unit tests, we compare text written in logs or stdout/stderr
to figure out the success or failure of tests. In Windows,
since new line is represented by CR+LF, autoconf tests run in
MinGW environment fail.
Asking diff to ignore trailing carriage returns is one way
to solve the problem
Suggested-by: Ben Pfaff <blp at nicira.com>
Signed-off-by: Gurucharan Shetty <gshetty at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>
commit b3c3eec7195a86e343b58e52601c5ab676e07a0b
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=b3c3eec7195a86e343b58e52601c5ab676e07a0b
Author: Gurucharan Shetty <gshetty at nicira.com>
testsuite.at: kill for windows.
We use kill to cleanup processes from pidfiles.
Windows has a 'taskkill' which does something similar.
We can check if the process with a PID exists with
'tasklist'. Both tasklist and taskkill return 0 for
both success and failure. So, we will have to grep
to see if there is a o/p.
A typical o/p of tasklist is:
$ tasklist | grep ovs
ovsdb-server.exe 3228 RDP-Tcp#0 2 6,132 K
ovs-vswitchd.exe 2080 RDP-Tcp#0 2 5,808 K
$ tasklist //fi "PID eq 3228"
Image Name PID Session Name Session# Mem Usage
========================= ======== ================ =========== ============
ovsdb-server.exe 3228 RDP-Tcp#0 2 6,132 K
Signed-off-by: Gurucharan Shetty <gshetty at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>
commit 038b21a100dd346a7e1fbf833284e1d58949e7cb
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=038b21a100dd346a7e1fbf833284e1d58949e7cb
Author: Gurucharan Shetty <gshetty at nicira.com>
testsuite.at: pwd for windows.
On MinGW, "pwd -W" gives the present working directory
in the form of windows path (i.e C:/temp instead of /c/temp).
When we pass the directory path to daemons as arguments,
we should be passing it in the form of windows path.
Suggested-by: Ben Pfaff <blp at nicira.com>
Signed-off-by: Gurucharan Shetty <gshetty at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>
commit a9e9db79e7e6cdcb195e91c431c4a335b72b14da
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=a9e9db79e7e6cdcb195e91c431c4a335b72b14da
Author: Gurucharan Shetty <gshetty at nicira.com>
daemon-windows: Create pidfiles with option --pidfile.
In Windows, we cannot delete a file that has been opened.
We use this feature to "lock" the pidfile.
Signed-off-by: Gurucharan Shetty <gshetty at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>
commit 4ec4776c69d44acb3379e663ca700fd7ab3aecb2
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=4ec4776c69d44acb3379e663ca700fd7ab3aecb2
Author: Gurucharan Shetty <gshetty at nicira.com>
daemon-windows: Implement --detach option for Windows.
When "--detach" is specified, a daemon will create a new
process with the same command line options as the parent.
Additionally, an undocumented command line option "--pipe-handle"
is passed to child. Once the child is ready to handle external
commands, it communicates with the parent that it is ready using
the pipe handle. The parent exits. This lets us run the daemons
in background. This will also help the unit tests because currently
most of the unit tests pass the '--detach' option to the daemons.
Signed-off-by: Gurucharan Shetty <gshetty at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>
commit 69b17834a47300d13e86c680f03800d107ab9b1e
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=69b17834a47300d13e86c680f03800d107ab9b1e
Author: Gurucharan Shetty <gshetty at nicira.com>
daemon-windows: Rename service variables.
Sa far, we are using variable 'detach' to indicate whether the option
"--service" has been set. We were using variable 'detached' to indicate that
the daemon is being called from the Windows services manager.
An upcoming commit introduces command line option "--detach" for daemons
running on Windows. This will cause confusion with variable names.
Therefore, rename the variables.
Signed-off-by: Gurucharan Shetty <gshetty at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>
commit e3f512b07c11de6b297050bb969fd0d8a07f9357
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=e3f512b07c11de6b297050bb969fd0d8a07f9357
Author: Gurucharan Shetty <gshetty at nicira.com>
stream: Introduce [p]windows_[p]stream_class.
On Linux, we heavily use --remote=punix:* to listen for
connections through unix domain sockets. We also use, unix:*
to connect to a daemon that is listening on unix domain sockets.
Many times, we create default unix domain sockets for listening
and many utilities connect to these sockets by default.
Windows does not have unix domain sockets. So far, we could just use
ptcp:* and tcp:* for listening and initiating connections respectively.
The drawback here is that one has to provide a specific TCP port.
For unit tests, it looks useful to let kernel choose that port.
As such, we can let that chosen kernel port be stored in the
file specified with punix:* and unix:*. For this purpose, introduce
a new [p]windows_[p]stream_class. Since it is just a wrapper around
[p]tcp_[p]stream_class, add it to stream-tcp.c.
commit cb54a8c (unixctl: Add support for Windows.) used the above concept
for only control channel connections (i.e., --unixctl for daemons and its
interaction with ovs-appctl). This commit adds the same support for
all unix domain sockets. Now that we have a separate class
[p]stream_class for hiding kernel assigned TCP port inside a file meant for
unix domain sockets in windows, make unixctl use it.
Signed-off-by: Gurucharan Shetty <gshetty at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>
commit c7c1bdf355d8885a61363f39a759baa96621f0f2
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=c7c1bdf355d8885a61363f39a759baa96621f0f2
Author: Gurucharan Shetty <gshetty at nicira.com>
tests: Define a variable "IS_WIN32" for tests.
Signed-off-by: Gurucharan Shetty <gshetty at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>
-----------------------------------------------------------------------
Summary of changes:
lib/daemon-windows.c | 205 +++++++++++++++++++++++++++++++++++++++++++---
lib/daemon.h | 34 ++++++--
lib/stream-provider.h | 5 ++
lib/stream-tcp.c | 113 +++++++++++++++++++++++++
lib/stream.c | 4 +
lib/unixctl.c | 67 +++------------
lib/vconn-active.man | 4 +-
ovsdb/remote-active.man | 5 +-
ovsdb/remote-passive.man | 5 +-
tests/atlocal.in | 10 +++
tests/testsuite.at | 39 +++++++++
11 files changed, 412 insertions(+), 79 deletions(-)
hooks/post-receive
--
Open vSwitch
More information about the git
mailing list