Age | Commit message (Collapse) | Author | Files | Lines |
|
Add Python 3 compatibility to indexcap.py and only create a tmpdir for
actions that need it. Only remove tmpdir for the compare action and
try to remove the temp dir even if an exception occurs.
In list_protos_in_cap.sh, rename BIN_DIR to WS_BIN_PATH (matching
test/config.sh) and allow it to be overridden from the environment.
Tested with Python 2.6.6, 2.7.9, 3.2.6, 3.4.3 as follows (with tshark
built using cmake and '-b /tmp/wsbuild/run'):
tools/indexcap.py out pop-ssl.pcapng;
tools/indexcap.py out pop-ssl.pcapng --list-all-proto;
tools/indexcap.py out pop-ssl.pcapng --list-all-files;
tools/indexcap.py out pop-ssl.pcapng --list-all-proto-files=ssl;
rm out;
Python 2.5.6 does not work (there is no multiprocessing module). The
dict output in Python 3.4.3 is different (has the hash function
changed?)
Change-Id: I592d8c4458a20d5088d815c6dd1cf90c9d3df9d3
Reviewed-on: https://code.wireshark.org/review/7792
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: Ib77af11975873106b7db7ac1bcd12f4a0800b59e
TypeError: extract_protos_from_file() takes exactly 6 arguments (7 given)
Reviewed-on: https://code.wireshark.org/review/779
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
|
|
There are a few things in here which could still use attention.
Don't regenerate anything now.
Change-Id: I283c224d3523212144707fca3d6265916cb11792
Reviewed-on: https://code.wireshark.org/review/205
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
|
|
svn path=/trunk/; revision=44175
|
|
svn path=/trunk/; revision=43538
|
|
svn path=/trunk/; revision=30591
|
|
svn path=/trunk/; revision=30504
|
|
svn path=/trunk/; revision=30503
|
|
svn path=/trunk/; revision=30486
|
|
svn path=/trunk/; revision=30170
|
|
* Do file comparison on stdout/stderr output
svn path=/trunk/; revision=30169
|
|
be able to compare any changes that we've made to the working directory against a clean/baseline version of tshark.
svn path=/trunk/; revision=30168
|
|
protocols (--list-all-proto-files). The index file is used to search for the files matching the given protocol(s)
svn path=/trunk/; revision=30167
|
|
svn path=/trunk/; revision=30166
|
|
delimited list of protocols)
svn path=/trunk/; revision=30160
|
|
Name: svn:executable
+ *
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
svn path=/trunk/; revision=30157
|
|
svn path=/trunk/; revision=30156
|
|
* Remove timeout (this wasn't correctly implemented)
svn path=/trunk/; revision=30155
|
|
svn path=/trunk/; revision=30153
|
|
svn path=/trunk/; revision=30152
|
|
svn path=/trunk/; revision=30150
|
|
svn path=/trunk/; revision=30149
|
|
svn path=/trunk/; revision=30148
|
|
* Add more verbose output
svn path=/trunk/; revision=30147
|
|
svn path=/trunk/; revision=30146
|
|
svn path=/trunk/; revision=30143
|
|
currently extracts all protocols that appear in the given capture files.
svn path=/trunk/; revision=30120
|