Skip to content

Commit

Permalink
Merge pull request #12 from Quicr/sync-upstream-1211
Browse files Browse the repository at this point in the history
Sync upstream to include priority updates/fixes
  • Loading branch information
TimEvens committed Dec 11, 2023
2 parents 14136f0 + 4bb5e01 commit 69a1e3b
Show file tree
Hide file tree
Showing 32 changed files with 2,030 additions and 313 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci-asan-ubsan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ jobs:
else
echo "No leaks detected in picoquic_ct"
fi
./picohttp_ct -n -r 1>http_ct.txt 2>sanity.txt || QUICHTTPRESULT=$?
#./picohttp_ct -n -r 1>http_ct.txt 2>sanity.txt || QUICHTTPRESULT=$?
./picohttp_ct -n -r 2>sanity.txt || QUICHTTPRESULT=$?
echo "running picohttp_ct returns <$QUICHTTPRESULT> "
cat sanity.txt
if [ ! -z ${QUICHTTPRESULT} ]; then
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-tests-no-fusion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
make test && QUICRESULT=$?
cd ..
if [[ ${QUICRESULT} == 0 ]]; then exit 0; fi;
cat /home/runner/work/picoquic/picoquic/build/Testing/Temporary/LastTest.log
exit 1
#TODO: reset the test once openssl issue is understood.
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ Release
*/*.ilk
*.b
/picoquic/qlogger.c
/picohttp_t/h3-m-www
9 changes: 8 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ else()
endif()

project(picoquic
VERSION 1.1.15.0
VERSION 1.1.16.0
DESCRIPTION "picoquic library"
LANGUAGES C CXX)

Expand Down Expand Up @@ -407,6 +407,13 @@ if(BUILD_TESTING AND picoquic_BUILD_TESTS)
COMMAND picoquic_ct -S ${PROJECT_SOURCE_DIR} -n -r)
add_test(NAME picohttp_ct
COMMAND picohttp_ct -S ${PROJECT_SOURCE_DIR} -n -r)

add_executable(thread_test
thread_tester/thread_test.c)
target_link_libraries(thread_test PRIVATE picoquic-log picoquic-core)
target_include_directories(thread_test PRIVATE loglib picoquic)
set_picoquic_compile_settings(thread_test)

endif()

# get all project files for formatting
Expand Down
Loading

0 comments on commit 69a1e3b

Please sign in to comment.