Skip to content

Commit 4814e7f

Browse files
authored
Install tshark for automated tests in servo#36033 (servo#36201)
Signed-off-by: Delan Azabani <[email protected]>
1 parent a2b46cf commit 4814e7f

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

python/servo/platform/linux.py

+8-7
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
from .base import Base
1616
from .build_target import BuildTarget
1717

18-
# Please keep these in sync with the packages on the wiki, using the instructions below
19-
# https://github.com/servo/servo/wiki/Building
18+
# Please keep these in sync with the packages in the book, using the instructions below
19+
# https://book.servo.org/hacking/setting-up-your-environment.html
2020

2121
# https://packages.debian.org
2222
# https://packages.ubuntu.com
2323
# 1. open devtools
2424
# 2. paste in the whole APT_PKGS = [...]
2525
# 3. copy(`sudo apt install ${APT_PKGS.join(" ")}`)
26-
# 4. paste into https://github.com/servo/servo/wiki/Building#debian-based-distributions
26+
# 4. paste into https://github.com/servo/book/edit/main/src/hacking/setting-up-your-environment.md
2727
APT_PKGS = [
2828
'build-essential', 'ccache', 'clang', 'cmake', 'curl', 'g++', 'git',
2929
'gperf', 'libdbus-1-dev', 'libfreetype6-dev', 'libgl1-mesa-dri',
@@ -39,14 +39,15 @@
3939
'libharfbuzz-dev', 'liblzma-dev', 'libudev-dev', 'libunwind-dev',
4040
'libvulkan1', 'libx11-dev', 'libxcb-render0-dev', 'libxcb-shape0-dev',
4141
'libxcb-xfixes0-dev', 'libxmu-dev', 'libxmu6', 'libegl1-mesa-dev',
42-
'llvm-dev', 'm4', 'xorg-dev', 'libxkbcommon0', "libxkbcommon-x11-0"
42+
'llvm-dev', 'm4', 'xorg-dev', 'libxkbcommon0', "libxkbcommon-x11-0",
43+
'tshark',
4344
]
4445

4546
# https://packages.fedoraproject.org
4647
# 1. open devtools
4748
# 2. paste in the whole DNF_PKGS = [...]
4849
# 3. copy(`sudo dnf install ${DNF_PKGS.join(" ")}`)
49-
# 4. paste into https://github.com/servo/servo/wiki/Building#fedora
50+
# 4. paste into https://github.com/servo/book/edit/main/src/hacking/setting-up-your-environment.md
5051
DNF_PKGS = ['libtool', 'gcc-c++', 'libXi-devel', 'freetype-devel',
5152
'libunwind-devel', 'mesa-libGL-devel', 'mesa-libEGL-devel',
5253
'glib2-devel', 'libX11-devel', 'libXrandr-devel', 'gperf',
@@ -58,13 +59,13 @@
5859
'gstreamer1-plugins-good', 'gstreamer1-plugins-bad-free-devel',
5960
'gstreamer1-plugins-ugly-free', 'libjpeg-turbo-devel',
6061
'zlib-ng', 'libjpeg-turbo', 'vulkan-loader', 'libxkbcommon',
61-
'libxkbcommon-x11']
62+
'libxkbcommon-x11', 'wireshark-cli']
6263

6364
# https://voidlinux.org/packages/
6465
# 1. open devtools
6566
# 2. paste in the whole XBPS_PKGS = [...]
6667
# 3. copy(`sudo xbps-install ${XBPS_PKGS.join(" ")}`)
67-
# 4. paste into https://github.com/servo/servo/wiki/Building#void-linux
68+
# 4. paste into https://github.com/servo/book/edit/main/src/hacking/setting-up-your-environment.md
6869
XBPS_PKGS = ['libtool', 'gcc', 'libXi-devel', 'freetype-devel',
6970
'libunwind-devel', 'MesaLib-devel', 'glib-devel', 'pkg-config',
7071
'libX11-devel', 'libXrandr-devel', 'gperf', 'bzip2-devel',

shell.nix

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ stdenv.mkDerivation (androidEnvironment // {
8181
llvmPackages.bintools # provides lld
8282

8383
udev # Needed by libudev-sys for GamePad API.
84+
wireshark-cli # for `tshark` in etc/devtools_parser.py
8485

8586
# Build utilities
8687
cmake dbus gcc git pkg-config which llvm perl yasm m4

0 commit comments

Comments
 (0)