From 95ed9437795eea31153df217e1e2203d06cdf6fa Mon Sep 17 00:00:00 2001
From: Christian Huitema <huitema@huitema.net>
Date: Thu, 7 Dec 2023 16:40:56 -0800
Subject: [PATCH 1/5] Always trace picohhtp_t tests

---
 picohttp_t/picohttp_t.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/picohttp_t/picohttp_t.c b/picohttp_t/picohttp_t.c
index 9d92446a9..9e9b0099f 100644
--- a/picohttp_t/picohttp_t.c
+++ b/picohttp_t/picohttp_t.c
@@ -268,6 +268,7 @@ int main(int argc, char** argv)
             if (optind >= argc) {
                 for (size_t i = 0; i < nb_tests; i++) {
                     if (test_status[i] == test_not_run) {
+                        fprintf(stdout, "Test number %d: %s\n", (int)i, test_table[i].test_name);
                         nb_test_tried++;
                         if (do_one_test(i, stdout) != 0) {
                             test_status[i] = test_failed;
@@ -293,6 +294,7 @@ int main(int argc, char** argv)
                     }
                     else {
                         nb_test_tried++;
+                        fprintf(stdout, "Test number %d: %s\n", (int)test_number, test_table[test_number].test_name);
                         if (do_one_test(test_number, stdout) != 0) {
                             test_status[test_number] = test_failed;
                             nb_test_failed++;

From 080ddeb79695e88f0e9ee1e85b7892fc58629362 Mon Sep 17 00:00:00 2001
From: Christian Huitema <huitema@huitema.net>
Date: Thu, 7 Dec 2023 17:01:43 -0800
Subject: [PATCH 2/5] Show comments in leak test

---
 .github/workflows/ci-asan-ubsan.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-asan-ubsan.yml b/.github/workflows/ci-asan-ubsan.yml
index 1140731ae..5f0a71513 100644
--- a/.github/workflows/ci-asan-ubsan.yml
+++ b/.github/workflows/ci-asan-ubsan.yml
@@ -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

From 14f026d09e244025d7e946850dd7144a75ba0023 Mon Sep 17 00:00:00 2001
From: Christian Huitema <huitema@huitema.net>
Date: Thu, 7 Dec 2023 17:38:38 -0800
Subject: [PATCH 3/5] Remove unnecessary comments

---
 picohttp_t/picohttp_t.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/picohttp_t/picohttp_t.c b/picohttp_t/picohttp_t.c
index 9e9b0099f..9d92446a9 100644
--- a/picohttp_t/picohttp_t.c
+++ b/picohttp_t/picohttp_t.c
@@ -268,7 +268,6 @@ int main(int argc, char** argv)
             if (optind >= argc) {
                 for (size_t i = 0; i < nb_tests; i++) {
                     if (test_status[i] == test_not_run) {
-                        fprintf(stdout, "Test number %d: %s\n", (int)i, test_table[i].test_name);
                         nb_test_tried++;
                         if (do_one_test(i, stdout) != 0) {
                             test_status[i] = test_failed;
@@ -294,7 +293,6 @@ int main(int argc, char** argv)
                     }
                     else {
                         nb_test_tried++;
-                        fprintf(stdout, "Test number %d: %s\n", (int)test_number, test_table[test_number].test_name);
                         if (do_one_test(test_number, stdout) != 0) {
                             test_status[test_number] = test_failed;
                             nb_test_failed++;

From 51c132547221107a83b8cb884aacee852b0f59f5 Mon Sep 17 00:00:00 2001
From: Christian Huitema <huitema@huitema.net>
Date: Thu, 7 Dec 2023 17:55:58 -0800
Subject: [PATCH 4/5] Remove extra prints in baton tests

---
 .gitignore                       | 1 +
 picoquictest/webtransport_test.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 856409949..e5536901d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ Release
 */*.ilk
 *.b
 /picoquic/qlogger.c
+/picohttp_t/h3-m-www
diff --git a/picoquictest/webtransport_test.c b/picoquictest/webtransport_test.c
index 99f54baa4..766182782 100644
--- a/picoquictest/webtransport_test.c
+++ b/picoquictest/webtransport_test.c
@@ -124,6 +124,7 @@ static int picowt_baton_test_one(
             ret = 1;
         }
         else {
+            h3zero_cb->no_print = 1;
             picoquic_set_callback(test_ctx->cnx_client, h3zero_callback, h3zero_cb);
             /* Initialize the callback context. First, create a bidir stream */
             wt_baton_ctx_init(&baton_ctx, h3zero_cb, NULL, NULL);

From 5624fbf8d7b5fb176a4fac940a7e7e47ab5bb83e Mon Sep 17 00:00:00 2001
From: Christian Huitema <huitema@huitema.net>
Date: Thu, 7 Dec 2023 20:49:15 -0800
Subject: [PATCH 5/5] Add display of log on failure

---
 .github/workflows/ci-tests-no-fusion.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci-tests-no-fusion.yml b/.github/workflows/ci-tests-no-fusion.yml
index 66971095f..0c3c5f4cd 100644
--- a/.github/workflows/ci-tests-no-fusion.yml
+++ b/.github/workflows/ci-tests-no-fusion.yml
@@ -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.