Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: refactor pcap test to use version from rtshark #4774

Merged
merged 2 commits into from
Sep 18, 2024

Conversation

lrstewart
Copy link
Contributor

@lrstewart lrstewart commented Sep 16, 2024

Description of changes:

I didn't like that we had to call tshark directly in the pcap test build script, so I moved that logic into rtshark: CrabeDeFrance/rtshark@1e9b7eb Now we can just get the version from rtshark.

Testing:

The test correctly still can't run on Ubuntu18 😔

error: failed to run custom build command for `pcap v0.1.0 (/home/ubuntu/s2n-tls/tests/pcap)`

Caused by:
  process didn't exit successfully: `/home/ubuntu/s2n-tls/tests/pcap/target/debug/build/pcap-a2228bd6ce729e8c/build-script-build` (exit status: 101)
  --- stderr
  thread 'main' panicked at build.rs:116:5:
  tshark 4.2.0 required. tshark 3.6.2 found.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@github-actions github-actions bot added the s2n-core team label Sep 16, 2024
@lrstewart lrstewart marked this pull request as ready for review September 16, 2024 00:43
@lrstewart lrstewart requested review from jmayclin and jouho September 16, 2024 00:44
@lrstewart lrstewart enabled auto-merge (squash) September 17, 2024 19:09
@lrstewart lrstewart merged commit 1c948da into aws:main Sep 18, 2024
37 checks passed
@lrstewart lrstewart deleted the pcaps branch September 18, 2024 05:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants