Skip to content

Clean up the project after moving into picoquic #83

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.

Sign up for GitHub

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

Merged
huitema merged 15 commits into from
Nov 6, 2025
Merged

Clean up the project after moving into picoquic #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9da04db
remove c4 delmo, use picoquicdemo
huitema Nov 5, 2025
138fefb
remoce c4_demo from cmake
huitema Nov 5, 2025
0a38ee0
simplify tests
huitema Nov 5, 2025
5bcece7
Add step for picoquic ns in github action
huitema Nov 5, 2025
fa102ca
document build steps in test
huitema Nov 5, 2025
4eb9f99
chmod +x picoquic_ns
huitema Nov 5, 2025
2c34a29
Add tests back
huitema Nov 5, 2025
02d9dcf
Merge branch 'clean-vs-project' of https://github.com/private-octopus…
huitema Nov 5, 2025
f83f361
add debug info
huitema Nov 5, 2025
2b3ba09
reference picoquic_ns in tests
huitema Nov 6, 2025
658b164
More debug info
huitema Nov 6, 2025
b160066
Fix typo in debug
huitema Nov 6, 2025
668aab6
Actually build picoquic_ns
huitema Nov 6, 2025
f91c627
Proper location of sim specs
huitema Nov 6, 2025
c73acbf
Clean up the test
huitema Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 23 additions & 24 deletions .github/workflows/test-suite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,47 +19,46 @@ 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

# Build pico_sim and run tests
- run: |
mkdir build
cd build
cmake ..
cmake --build .
make
- name: Install picoquic_ns
run: |
./ci/build_picoquic_ns.sh
- name: Do simple tests
run: |
ulimit -c unlimited -S
# Iterate through all the scenarios
./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;
./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;
./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;
./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;
./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;
./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;
./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;
./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;
./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;
./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;
./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;
./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;
./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



13 changes: 0 additions & 13 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 3 additions & 0 deletions ci/build_picoquic.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..
11 changes: 11 additions & 0 deletions ci/build_picoquic_ns.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/sh
#build last picoquic master (for Travis)

cd ..
git clone https://github.com/private-octopus/picoquic_ns
cd picoquic_ns
cmake $CMAKE_OPTS .
make -j$(nproc) all
pwd
ls
cd ..
13 changes: 0 additions & 13 deletions pico_sim_vs/pico_sim_vs.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down