Skip to content

Commit 23ce494

Browse files
committed
Add P2P test to CI
1 parent 537d084 commit 23ce494

2 files changed

Lines changed: 23 additions & 13 deletions

File tree

.github/run-single-config.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def compiler_env(compiler: str, base_env: dict[str, str]) -> dict[str, str]:
6868

6969
def parse_test_specs(specs: list[str] | None) -> list[list[str]]:
7070
if specs is None:
71-
specs = ["test_crypto", "test_connection:suite-quick"]
71+
specs = ["test_crypto", "test_connection:suite-quick", "test_p2p.py"]
7272

7373
commands: list[list[str]] = []
7474
for spec in specs:
@@ -126,8 +126,13 @@ def main() -> int:
126126
test_cmds: list[list[str]] = []
127127
if args.run_tests:
128128
for test_parts in parse_test_specs(args.tests):
129-
exe = str(Path(args.build_dir) / "bin" / test_parts[0])
130-
test_cmds.append([exe, *test_parts[1:]])
129+
test_prog = test_parts[0]
130+
test_args = test_parts[1:]
131+
test_path = str(Path(args.build_dir) / "bin" / test_prog)
132+
if test_prog.endswith(".py"):
133+
test_cmds.append(["python3", test_path, *test_args])
134+
else:
135+
test_cmds.append([test_path, *test_args])
131136

132137
# If ccache isn't available in a local environment, remove launcher flags.
133138
if shutil.which("ccache") is None:

.github/workflows/build.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,49 +18,49 @@ jobs:
1818
use_webrtc: false
1919
crypto: default
2020
crypto25519: default
21-
targets: "test_connection test_crypto"
21+
targets: "test_connection test_p2p trivial_signaling_server publish_test_script test_crypto"
2222
run_tests: true
23-
tests: "test_crypto test_connection:suite-quick"
23+
tests: "test_crypto test_connection:suite-quick test_p2p.py"
2424
- row: gcc-openssl-crypto
2525
compiler: gcc
2626
build_dir: build-ci-quick-gcc
2727
sanitizer: none
2828
use_webrtc: false
2929
crypto: default
3030
crypto25519: default
31-
targets: "test_crypto"
31+
targets: "test_p2p trivial_signaling_server publish_test_script test_crypto"
3232
run_tests: true
33-
tests: "test_crypto"
33+
tests: "test_crypto test_p2p.py"
3434
- row: clang-libsodium
3535
compiler: clang
3636
build_dir: build-ci-quick-sodium
3737
sanitizer: none
3838
use_webrtc: false
3939
crypto: libsodium
4040
crypto25519: libsodium
41-
targets: "test_crypto"
41+
targets: "test_p2p trivial_signaling_server publish_test_script test_crypto"
4242
run_tests: true
43-
tests: "test_crypto"
43+
tests: "test_crypto test_p2p.py"
4444
- row: clang-reference-25519
4545
compiler: clang
4646
build_dir: build-ci-quick-ref25519
4747
sanitizer: none
4848
use_webrtc: false
4949
crypto: default
5050
crypto25519: Reference
51-
targets: "test_crypto"
51+
targets: "test_p2p trivial_signaling_server publish_test_script test_crypto"
5252
run_tests: true
53-
tests: "test_crypto"
53+
tests: "test_crypto test_p2p.py"
5454
- row: clang-openssl-webrtc
5555
compiler: clang
5656
build_dir: build-ci-quick-webrtc
5757
sanitizer: none
5858
use_webrtc: true
5959
crypto: default
6060
crypto25519: default
61-
targets: "test_crypto"
61+
targets: "test_p2p trivial_signaling_server publish_test_script test_crypto"
6262
run_tests: true
63-
tests: "test_crypto"
63+
tests: "test_crypto test_p2p.py"
6464
env:
6565
CI_BUILD: 1
6666
IMAGE: ubuntu
@@ -207,3 +207,8 @@ jobs:
207207
rem test_connection.exe suite-quick -- Loopback throughput test not performing on github hosted runners for some reason
208208
test_connection.exe identity quick lane_quick_queueanddrain lane_quick_priority_and_background
209209
shell: cmd
210+
211+
- name: Test p2p
212+
working-directory: '${{ github.workspace }}/build/bin'
213+
run: py -3 test_p2p.py
214+
shell: cmd

0 commit comments

Comments
 (0)