From 9da04dbed6acf446e94da6e885641456b5938d97 Mon Sep 17 00:00:00 2001 From: huitema Date: Wed, 5 Nov 2025 13:59:03 -0800 Subject: [PATCH 01/14] remove c4 delmo, use picoquicdemo --- pico_sim_vs/pico_sim_vs.sln | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pico_sim_vs/pico_sim_vs.sln b/pico_sim_vs/pico_sim_vs.sln index 97ca101..e8e315b 100644 --- a/pico_sim_vs/pico_sim_vs.sln +++ b/pico_sim_vs/pico_sim_vs.sln @@ -8,11 +8,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pico_sim_vs", "pico_sim_vs. {9CBC4D21-6901-4781-91F9-1A2F00AA176E} = {9CBC4D21-6901-4781-91F9-1A2F00AA176E} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "c4_demo", "c4_demo.vcxproj", "{F90A0E94-EDC2-42D2-B1B0-421C05A283BF}" - ProjectSection(ProjectDependencies) = postProject - {9CBC4D21-6901-4781-91F9-1A2F00AA176E} = {9CBC4D21-6901-4781-91F9-1A2F00AA176E} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "c4_lib", "..\c4_lib\c4_lib.vcxproj", "{9CBC4D21-6901-4781-91F9-1A2F00AA176E}" EndProject Global @@ -31,14 +26,6 @@ Global {43B13A86-3049-4E22-9D58-38358E3151CA}.Release|x64.Build.0 = Release|x64 {43B13A86-3049-4E22-9D58-38358E3151CA}.Release|x86.ActiveCfg = Release|Win32 {43B13A86-3049-4E22-9D58-38358E3151CA}.Release|x86.Build.0 = Release|Win32 - {F90A0E94-EDC2-42D2-B1B0-421C05A283BF}.Debug|x64.ActiveCfg = Debug|x64 - {F90A0E94-EDC2-42D2-B1B0-421C05A283BF}.Debug|x64.Build.0 = Debug|x64 - {F90A0E94-EDC2-42D2-B1B0-421C05A283BF}.Debug|x86.ActiveCfg = Debug|Win32 - {F90A0E94-EDC2-42D2-B1B0-421C05A283BF}.Debug|x86.Build.0 = Debug|Win32 - {F90A0E94-EDC2-42D2-B1B0-421C05A283BF}.Release|x64.ActiveCfg = Release|x64 - {F90A0E94-EDC2-42D2-B1B0-421C05A283BF}.Release|x64.Build.0 = Release|x64 - {F90A0E94-EDC2-42D2-B1B0-421C05A283BF}.Release|x86.ActiveCfg = Release|Win32 - {F90A0E94-EDC2-42D2-B1B0-421C05A283BF}.Release|x86.Build.0 = Release|Win32 {9CBC4D21-6901-4781-91F9-1A2F00AA176E}.Debug|x64.ActiveCfg = Debug|x64 {9CBC4D21-6901-4781-91F9-1A2F00AA176E}.Debug|x64.Build.0 = Debug|x64 {9CBC4D21-6901-4781-91F9-1A2F00AA176E}.Debug|x86.ActiveCfg = Debug|Win32 From 138fefbb6b9e12e5b94dc7dea51032132b982ff6 Mon Sep 17 00:00:00 2001 From: huitema Date: Wed, 5 Nov 2025 14:00:20 -0800 Subject: [PATCH 02/14] remoce c4_demo from cmake --- CMakeLists.txt | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 830694e..3cd3526 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,19 +56,6 @@ target_link_libraries(pico_sim ${CMAKE_THREAD_LIBS_INIT} ) -add_executable(c4_demo - src/c4_demo.c -) - -target_link_libraries(c4_demo - c4_lib - ${Picoquic_LIBRARIES} - ${PTLS_LIBRARIES} - ${OPENSSL_LIBRARIES} - ${CMAKE_DL_LIBS} - ${CMAKE_THREAD_LIBS_INIT} -) - # get all project files for formatting file(GLOB_RECURSE CLANG_FORMAT_SOURCE_FILES *.c *.h) From 0a38ee02932605dd4fefb44e7f810a356e70873b Mon Sep 17 00:00:00 2001 From: huitema Date: Wed, 5 Nov 2025 14:03:06 -0800 Subject: [PATCH 03/14] simplify tests --- .github/workflows/test-suite.yml | 38 -------------------------------- 1 file changed, 38 deletions(-) diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index 15c490c..9bc7269 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -25,41 +25,3 @@ jobs: ./ci/build_picotls.sh ./ci/build_picoquic.sh - # Build pico_sim and run tests - - run: | - mkdir build - cd build - cmake .. - cmake --build . - make - ulimit -c unlimited -S - # Iterate through all the scenarios - ./pico_sim -S ../../picoquic ../sim_specs/c4_alone.txt && QDRESULT=$? - if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./pico_sim -S ../../picoquic ../sim_specs/c4_alone_200.txt && QDRESULT=$? - if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./pico_sim -S ../../picoquic ../sim_specs/c4_vs_c4.txt && QDRESULT=$? - if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./pico_sim -S ../../picoquic ../sim_specs/c4_after_c4.txt && QDRESULT=$? - if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./pico_sim -S ../../picoquic ../sim_specs/c4_before_c4.txt && QDRESULT=$? - if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./pico_sim -S ../../picoquic ../sim_specs/c4_vs_cubic.txt && QDRESULT=$? - if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./pico_sim -S ../../picoquic ../sim_specs/c4_wifi_fade.txt && QDRESULT=$? - if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./pico_sim -S ../../picoquic ../sim_specs/c4_wifi_suspension.txt && QDRESULT=$? - if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./pico_sim -S ../../picoquic ../sim_specs/c4_media.txt && QDRESULT=$? - if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./pico_sim -S ../../picoquic ../sim_specs/c4_media10.txt && QDRESULT=$? - if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./pico_sim -S ../../picoquic ../sim_specs/c4_media_wf.txt && QDRESULT=$? - if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./pico_sim -S ../../picoquic ../sim_specs/c4_media_ws.txt && QDRESULT=$? - if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./pico_sim -S ../../picoquic ../sim_specs/c4_short_long.txt && QDRESULT=$? - if [ ${QDRESULT} != 0 ]; then exit 1; fi; - exit 0 - - From 5bcece7cd6684d4fb8800f14fceca14f8b2aba8b Mon Sep 17 00:00:00 2001 From: huitema Date: Wed, 5 Nov 2025 14:27:12 -0800 Subject: [PATCH 04/14] Add step for picoquic ns in github action --- .github/workflows/test-suite.yml | 1 + ci/build_picoquic_ns.sh | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 ci/build_picoquic_ns.sh diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index 9bc7269..cfb27a4 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -24,4 +24,5 @@ jobs: ls -l ./ci ./ci/build_picotls.sh ./ci/build_picoquic.sh + ./ci/build_picoquic_ns.sh diff --git a/ci/build_picoquic_ns.sh b/ci/build_picoquic_ns.sh new file mode 100644 index 0000000..9057ef0 --- /dev/null +++ b/ci/build_picoquic_ns.sh @@ -0,0 +1,9 @@ +#!/bin/sh +#build last picoquic master (for Travis) + +cd .. +git clone https://github.com/private-octopus/picoquic_ns +cd picoquic +cmake $CMAKE_OPTS . +make -j$(nproc) all +cd .. From fa102ca6d2e6cb86a84cb2389b8356e0e2382593 Mon Sep 17 00:00:00 2001 From: huitema Date: Wed, 5 Nov 2025 14:58:40 -0800 Subject: [PATCH 05/14] document build steps in test --- .github/workflows/test-suite.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index cfb27a4..8dddd73 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -19,10 +19,15 @@ jobs: submodules: 'recursive' # Build picotls and picoquic. - - run: | + - name: Install picotls + run: | sudo apt-get install -y libssl-dev ls -l ./ci ./ci/build_picotls.sh + - name: Install picoquic + run: | ./ci/build_picoquic.sh + - name: Install picoquic_ns + run: | ./ci/build_picoquic_ns.sh From 4eb9f9940816f3c1df98921dc07be3cd851523af Mon Sep 17 00:00:00 2001 From: Christian Huitema Date: Wed, 5 Nov 2025 15:01:23 -0800 Subject: [PATCH 06/14] chmod +x picoquic_ns --- ci/build_picoquic_ns.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 ci/build_picoquic_ns.sh diff --git a/ci/build_picoquic_ns.sh b/ci/build_picoquic_ns.sh old mode 100644 new mode 100755 From 2c34a29e76c941d76f2cde78cea891562466b7be Mon Sep 17 00:00:00 2001 From: huitema Date: Wed, 5 Nov 2025 15:42:52 -0800 Subject: [PATCH 07/14] Add tests back --- .github/workflows/test-suite.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index 8dddd73..1c0d8b4 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -30,4 +30,35 @@ jobs: - name: Install picoquic_ns run: | ./ci/build_picoquic_ns.sh + - name: Do simple tests + run: | + ulimit -c unlimited -S + # Iterate through all the scenarios + ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_alone.txt && QDRESULT=$? + if [ ${QDRESULT} != 0 ]; then exit 1; fi; + ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_alone_200.txt && QDRESULT=$? + if [ ${QDRESULT} != 0 ]; then exit 1; fi; + ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_vs_c4.txt && QDRESULT=$? + if [ ${QDRESULT} != 0 ]; then exit 1; fi; + ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_after_c4.txt && QDRESULT=$? + if [ ${QDRESULT} != 0 ]; then exit 1; fi; + ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_before_c4.txt && QDRESULT=$? + if [ ${QDRESULT} != 0 ]; then exit 1; fi; + ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_vs_cubic.txt && QDRESULT=$? + if [ ${QDRESULT} != 0 ]; then exit 1; fi; + ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_wifi_fade.txt && QDRESULT=$? + if [ ${QDRESULT} != 0 ]; then exit 1; fi; + ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_wifi_suspension.txt && QDRESULT=$? + if [ ${QDRESULT} != 0 ]; then exit 1; fi; + ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_media.txt && QDRESULT=$? + if [ ${QDRESULT} != 0 ]; then exit 1; fi; + ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_media10.txt && QDRESULT=$? + if [ ${QDRESULT} != 0 ]; then exit 1; fi; + ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_media_wf.txt && QDRESULT=$? + if [ ${QDRESULT} != 0 ]; then exit 1; fi; + ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_media_ws.txt && QDRESULT=$? + if [ ${QDRESULT} != 0 ]; then exit 1; fi; + ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_short_long.txt && QDRESULT=$? + if [ ${QDRESULT} != 0 ]; then exit 1; fi; + exit 0 From f83f3617eda2d9a00b42a4f956847b611cd37268 Mon Sep 17 00:00:00 2001 From: huitema Date: Wed, 5 Nov 2025 15:47:04 -0800 Subject: [PATCH 08/14] add debug info --- .github/workflows/test-suite.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index 1c0d8b4..98f838b 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -32,6 +32,11 @@ jobs: ./ci/build_picoquic_ns.sh - name: Do simple tests run: | + pwd + echo "local" + ls . + echo "one up" + ls .. ulimit -c unlimited -S # Iterate through all the scenarios ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_alone.txt && QDRESULT=$? From 2b3ba09d6d8385c9682e454787eadace647da9a8 Mon Sep 17 00:00:00 2001 From: huitema Date: Wed, 5 Nov 2025 16:47:18 -0800 Subject: [PATCH 09/14] reference picoquic_ns in tests --- .github/workflows/test-suite.yml | 30 +++++++++++++----------------- ci/build_picoquic.sh | 3 +++ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index 98f838b..efc4161 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -33,37 +33,33 @@ jobs: - name: Do simple tests run: | pwd - echo "local" - ls . - echo "one up" - ls .. ulimit -c unlimited -S # Iterate through all the scenarios - ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_alone.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_alone.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_alone_200.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_alone_200.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_vs_c4.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_vs_c4.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_after_c4.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_after_c4.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_before_c4.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_before_c4.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_vs_cubic.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_vs_cubic.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_wifi_fade.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_wifi_fade.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_wifi_suspension.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_wifi_suspension.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_media.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_media.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_media10.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_media10.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_media_wf.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_media_wf.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_media_ws.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_media_ws.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ./picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_short_long.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_short_long.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; exit 0 diff --git a/ci/build_picoquic.sh b/ci/build_picoquic.sh index d9d537a..8b13b54 100755 --- a/ci/build_picoquic.sh +++ b/ci/build_picoquic.sh @@ -4,6 +4,9 @@ cd .. git clone https://github.com/private-octopus/picoquic cd picoquic +git checkout +git submodule init +git submodule update cmake $CMAKE_OPTS . make -j$(nproc) all cd .. From 658b1646441b8d112f27381a1af83885fc3df5c4 Mon Sep 17 00:00:00 2001 From: huitema Date: Wed, 5 Nov 2025 16:48:48 -0800 Subject: [PATCH 10/14] More debug info --- .github/workflows/test-suite.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index efc4161..952a4e9 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -33,6 +33,7 @@ jobs: - name: Do simple tests run: | pwd + ls ../picquic_ns ulimit -c unlimited -S # Iterate through all the scenarios ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_alone.txt && QDRESULT=$? From b16006647268930aeb2d423fc846c99797d687b0 Mon Sep 17 00:00:00 2001 From: huitema Date: Wed, 5 Nov 2025 16:49:43 -0800 Subject: [PATCH 11/14] Fix typo in debug --- .github/workflows/test-suite.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index 952a4e9..5cb9755 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -33,7 +33,7 @@ jobs: - name: Do simple tests run: | pwd - ls ../picquic_ns + ls ../picoquic_ns ulimit -c unlimited -S # Iterate through all the scenarios ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_alone.txt && QDRESULT=$? From 668aab61c64dc6a077567dd5e77b42e1b41da3ae Mon Sep 17 00:00:00 2001 From: huitema Date: Wed, 5 Nov 2025 16:54:24 -0800 Subject: [PATCH 12/14] Actually build picoquic_ns --- ci/build_picoquic_ns.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/build_picoquic_ns.sh b/ci/build_picoquic_ns.sh index 9057ef0..300404b 100755 --- a/ci/build_picoquic_ns.sh +++ b/ci/build_picoquic_ns.sh @@ -3,7 +3,9 @@ cd .. git clone https://github.com/private-octopus/picoquic_ns -cd picoquic +cd picoquic_ns cmake $CMAKE_OPTS . make -j$(nproc) all +pwd +ls cd .. From f91c6274c45c74265c4c965a0677cc9b6b796a1c Mon Sep 17 00:00:00 2001 From: huitema Date: Wed, 5 Nov 2025 17:00:17 -0800 Subject: [PATCH 13/14] Proper location of sim specs --- .github/workflows/test-suite.yml | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index 5cb9755..8f94d57 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -33,34 +33,39 @@ jobs: - name: Do simple tests run: | pwd + echo *** listing ../picoquic_ns *** ls ../picoquic_ns + echo *** listing . *** + pwd + ls + echo *** running the tests *** ulimit -c unlimited -S # Iterate through all the scenarios - ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_alone.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ./sim_specs/c4_alone.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_alone_200.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ./sim_specs/c4_alone_200.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_vs_c4.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ./sim_specs/c4_vs_c4.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_after_c4.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ./sim_specs/c4_after_c4.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_before_c4.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ./sim_specs/c4_before_c4.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_vs_cubic.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ./sim_specs/c4_vs_cubic.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_wifi_fade.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ./sim_specs/c4_wifi_fade.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_wifi_suspension.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ./sim_specs/c4_wifi_suspension.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_media.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ./sim_specs/c4_media.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_media10.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ./sim_specs/c4_media10.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_media_wf.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ./sim_specs/c4_media_wf.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_media_ws.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ./sim_specs/c4_media_ws.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; - ../picoquic_ns/pico_sim -S ../../picoquic ../sim_specs/c4_short_long.txt && QDRESULT=$? + ../picoquic_ns/pico_sim -S ../../picoquic ./sim_specs/c4_short_long.txt && QDRESULT=$? if [ ${QDRESULT} != 0 ]; then exit 1; fi; exit 0 From c73acbf95c8cb558434d6faed832b394c058f0f7 Mon Sep 17 00:00:00 2001 From: huitema Date: Wed, 5 Nov 2025 18:18:23 -0800 Subject: [PATCH 14/14] Clean up the test --- .github/workflows/test-suite.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index 8f94d57..3fe269f 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -32,13 +32,6 @@ jobs: ./ci/build_picoquic_ns.sh - name: Do simple tests run: | - pwd - echo *** listing ../picoquic_ns *** - ls ../picoquic_ns - echo *** listing . *** - pwd - ls - echo *** running the tests *** ulimit -c unlimited -S # Iterate through all the scenarios ../picoquic_ns/pico_sim -S ../../picoquic ./sim_specs/c4_alone.txt && QDRESULT=$?