zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wireshark: Fix install race and skip network capture tests (#26698)

Browse Source 
The network capture tests can't pass when built as normal user.
This commit is contained in:
Bernhard Kaindl 2021-10-13 18:39:19 +02:00 committed by GitHub
parent 6125117b5d
commit bcd1272253
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin/packages/wireshark/package.py
View File

@ -39,6 +39,11 @@ class Wireshark(CMakePackage):
depends_on('nghttp2', when='+nghttp2') depends_on('nghttp2', when='+nghttp2')
depends_on('qt@4.8:', when='+qt') depends_on('qt@4.8:', when='+qt')
def patch(self):
# These try to capture from the network and run not compiled programs
filter_file('suite_capture', '', 'CMakeLists.txt')
filter_file('suite_unittests', '', 'CMakeLists.txt')
def cmake_args(self): def cmake_args(self):
args = [ args = [
'-DENEABLE_CARES=ON', '-DENEABLE_CARES=ON',
@ -96,5 +101,6 @@ def install_headers(self):
folders = ['.', 'epan/crypt', 'epan/dfilter', 'epan/dissectors', folders = ['.', 'epan/crypt', 'epan/dfilter', 'epan/dissectors',
'epan/ftypes', 'epan/wmem', 'wiretap', 'wsutil'] 'epan/ftypes', 'epan/wmem', 'wiretap', 'wsutil']
for folder in folders: for folder in folders:
mkdirp(join_path(prefix.include.wireshark, folder))
install(join_path(folder, '*.h'), install(join_path(folder, '*.h'),
join_path(prefix.include.wireshark, folder)) join_path(prefix.include.wireshark, folder))