Merge branch 'develop' into libssl-not-found-issue

Author: sirknightj

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,11 +1,15 @@
 *Issue #, if available:*
 
 *What was changed?*
+-
 
 *Why was it changed?*
+-
 
 *How was it changed?*
+-
 
 *What testing was done for the changes?*
+-
 
-By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
+By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

.github/workflows/ci.yml

@@ -9,6 +9,10 @@ on:
     branches:
       - develop
       - master
+
+env:
+  AWS_KVS_LOG_LEVEL: 7
+
 jobs:
   mac-os-builds:
     strategy:
@@ -37,8 +41,8 @@ jobs:
     permissions:
       id-token: write
       contents: read
+
     env:
-      AWS_KVS_LOG_LEVEL: 2
       CC: ${{ matrix.compiler.cc }}
       CXX: ${{ matrix.compiler.cxx }}
 
@@ -92,8 +96,6 @@ jobs:
 
   linux-gcc-code-coverage:
     runs-on: ubuntu-22.04
-    env:
-      AWS_KVS_LOG_LEVEL: 2
     permissions:
       id-token: write
       contents: read
@@ -135,7 +137,6 @@ jobs:
     env:
       CC: clang
       CXX: clang++
-      AWS_KVS_LOG_LEVEL: 2
     steps:
       - name: Clone repository
         uses: actions/checkout@v3
@@ -169,7 +170,6 @@ jobs:
     env:
       CC: clang
       CXX: clang++
-      AWS_KVS_LOG_LEVEL: 2
     steps:
       - name: Clone repository
         uses: actions/checkout@v3
@@ -275,7 +275,6 @@ jobs:
 
     env:
       DEBIAN_FRONTEND: noninteractive
-      AWS_KVS_LOG_LEVEL: 2
       CC: gcc
       CXX: g++
 

tst/main.cpp

@@ -65,6 +65,16 @@ int main(int argc, char** argv)
         if (trial >= MAX_TRIALS) {
             ::testing::GTEST_FLAG(break_on_failure) = breakOnFailure;
         }
+
+        // Increase logging verbosity on retry
+        if (trial >= 1) {
+#ifdef _WIN32
+            _putenv_s("AWS_KVS_LOG_LEVEL", "1");
+#else
+            setenv("AWS_KVS_LOG_LEVEL", "1", 1);
+#endif
+        }
+
         rc = RUN_ALL_TESTS();
 
         // If there were some tests failed, set googletest filter flag to those failed tests.