diff options
| author | Ethan Jackson <ethan@nicira.com> | 2012-03-07 15:48:32 -0800 |
|---|---|---|
| committer | Ethan Jackson <ethan@nicira.com> | 2012-03-07 16:50:16 -0800 |
| commit | c9a2d670ebf21d28940ecb1f56b8afde665b4495 (patch) | |
| tree | b11f9217c78fafd82ebb3d60a9f1c8299a992122 /tests | |
| parent | 7921b912de1e347f418a116f6d83f802dee655e2 (diff) | |
| download | openvswitch-c9a2d670ebf21d28940ecb1f56b8afde665b4495.tar.gz | |
python: Make build number format consistent with C.
The C code displays the build number as the empty string when 0,
and as +build<num> otherwise. This commit updates version.py to be
consistent and tests that it is in the unit tests.
Signed-off-by: Ethan Jackson <ethan@nicira.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/atlocal.in | 2 | ||||
| -rw-r--r-- | tests/unixctl-py.at | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/atlocal.in b/tests/atlocal.in index 400a5c586..1d37b59a7 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -1,6 +1,4 @@ # -*- shell-script -*- -VERSION='@VERSION@' -BUILDNR='@BUILDNR@' HAVE_OPENSSL='@HAVE_OPENSSL@' HAVE_PYTHON='@HAVE_PYTHON@' PERL='@PERL@' diff --git a/tests/unixctl-py.at b/tests/unixctl-py.at index 8317add8b..52fb72a9e 100644 --- a/tests/unixctl-py.at +++ b/tests/unixctl-py.at @@ -109,7 +109,7 @@ The available commands are: mv stdout expout AT_CHECK([PYAPPCTL -t test-unixctl.py help], [0], [expout]) -AT_CHECK([echo "test-unixctl.py (Open vSwitch) $VERSION $BUILDNR" > expout]) +AT_CHECK([ovs-vsctl --version | sed 's/ovs-vsctl/test-unixctl.py/' | head -1 > expout]) AT_CHECK([APPCTL -t test-unixctl.py version], [0], [expout]) AT_CHECK([PYAPPCTL -t test-unixctl.py version], [0], [expout]) |