diff options
author | Peter Wu <peter@lekensteyn.nl> | 2015-03-22 15:46:33 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2015-03-25 07:15:36 +0000 |
commit | dbef80f5c723d63d174f645284dcd06cbddb3a48 (patch) | |
tree | 0415481755cae3419ede58559d655bf06be926e7 /doc | |
parent | 1ba4191c70784698a2fac085c508343d85c56486 (diff) | |
download | wireshark-dbef80f5c723d63d174f645284dcd06cbddb3a48.tar.gz |
dfilter-test.py: add OOT support and Python 3 compat
Support WS_BIN_PATH and SOURCE_DIR (modelled after test/config.sh) to
support out-of-tree builds (including cmake). Add Python 3 support and
mention this in the documentation.
Tested with Python 2.7.9, 3.2.6, 3.4.3:
WS_BIN_PATH=/tmp/wsbuild/run SOURCE_DIR=/tmp/wireshark \
tools/dfilter-test.py testBytesIPv6
(2.7.9 and 3.4.3 were also tested fully, but some cases seem to fail
even before this patch. 2.5.6 and 2.6.6 do not work because the unittest
module is outdated.)
Change-Id: I13074579f6f74206edb5cd7be8e7a8406de49c56
Reviewed-on: https://code.wireshark.org/review/7793
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/README.display_filter | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/README.display_filter b/doc/README.display_filter index db3ee6eb51..459e3fb512 100644 --- a/doc/README.display_filter +++ b/doc/README.display_filter @@ -554,7 +554,7 @@ expression generator. How to add a new test to dfilter-test.py ======================================== -Note: dfilter-test.py requires Python 2.7 +Note: dfilter-test.py requires Python 2.7 or newer (including Python 3) "tools/dfilter-test.py" is the main test script. It includes the test from files in tools/dftestlib. You can add a test |