Test more stuff

zpostfacto · zpostfacto · commit b438a930553f · 2026-04-28T17:49:34.000-07:00
- MacOS was never testing P2P!
- Run "test_connection suite-quick" on all platforms
- On all platforms, configure and build the Release and Debug configurations
  (but don't test them, at least not right now)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,39 +28,39 @@ jobs:
             use_webrtc: false
             crypto: default
             crypto25519: default
-            targets: "test_p2p trivial_signaling_server publish_test_script test_crypto"
+            targets: "test_connection test_p2p trivial_signaling_server publish_test_script test_crypto"
             run_tests: true
-            tests: "test_crypto test_p2p.py:--spewlevel=debug:--loglevel-p2prendezvous=debug"
+            tests: "test_crypto test_connection:suite-quick test_p2p.py:--spewlevel=debug:--loglevel-p2prendezvous=debug"
           - row: clang-libsodium
             compiler: clang
             build_dir: build-ci-quick-sodium
             sanitizer: none
             use_webrtc: false
             crypto: libsodium
             crypto25519: libsodium
-            targets: "test_p2p trivial_signaling_server publish_test_script test_crypto"
+            targets: "test_connection test_p2p trivial_signaling_server publish_test_script test_crypto"
             run_tests: true
-            tests: "test_crypto test_p2p.py:--spewlevel=debug:--loglevel-p2prendezvous=debug"
+            tests: "test_crypto test_connection:suite-quick test_p2p.py:--spewlevel=debug:--loglevel-p2prendezvous=debug"
           - row: clang-reference-25519
             compiler: clang
             build_dir: build-ci-quick-ref25519
             sanitizer: none
             use_webrtc: false
             crypto: default
             crypto25519: Reference
-            targets: "test_p2p trivial_signaling_server publish_test_script test_crypto"
+            targets: "test_connection test_p2p trivial_signaling_server publish_test_script test_crypto"
             run_tests: true
-            tests: "test_crypto test_p2p.py:--spewlevel=debug:--loglevel-p2prendezvous=debug"
+            tests: "test_crypto test_connection:suite-quick test_p2p.py:--spewlevel=debug:--loglevel-p2prendezvous=debug"
           - row: clang-openssl-webrtc
             compiler: clang
             build_dir: build-ci-quick-webrtc
             sanitizer: none
             use_webrtc: true
             crypto: default
             crypto25519: default
-            targets: "test_p2p trivial_signaling_server publish_test_script test_crypto"
+            targets: "test_connection test_p2p trivial_signaling_server publish_test_script test_crypto"
             run_tests: true
-            tests: "test_crypto test_p2p.py:--spewlevel=debug:--loglevel-p2prendezvous=debug"
+            tests: "test_crypto test_connection:suite-quick test_p2p.py:--spewlevel=debug:--loglevel-p2prendezvous=debug"
     env:
       CI_BUILD: 1
       IMAGE: ubuntu
@@ -74,7 +74,7 @@ jobs:
         run: |
           sudo -E bash .github/install.sh
           sudo -E bash .github/install-post.sh
-      - name: Build and run selected single config
+      - name: Build and test (RelWithDebInfo)
         run: |
           set -euo pipefail
 
@@ -111,6 +111,56 @@ jobs:
 
           python3 .github/run-single-config.py "${args[@]}"
 
+      - name: Build (Release)
+        run: |
+          set -euo pipefail
+
+          args=(
+            --compiler "${{ matrix.compiler }}"
+            --build-dir "build-release"
+            --build-type Release
+            --sanitizer none
+          )
+
+          if [[ "${{ matrix.use_webrtc }}" == "true" ]]; then
+            args+=(--use-webrtc)
+          fi
+
+          if [[ "${{ matrix.crypto }}" != "default" ]]; then
+            args+=(--crypto "${{ matrix.crypto }}")
+          fi
+
+          if [[ "${{ matrix.crypto25519 }}" != "default" ]]; then
+            args+=(--crypto25519 "${{ matrix.crypto25519 }}")
+          fi
+
+          python3 .github/run-single-config.py "${args[@]}"
+
+      - name: Build (Debug)
+        run: |
+          set -euo pipefail
+
+          args=(
+            --compiler "${{ matrix.compiler }}"
+            --build-dir "build-debug"
+            --build-type Debug
+            --sanitizer none
+          )
+
+          if [[ "${{ matrix.use_webrtc }}" == "true" ]]; then
+            args+=(--use-webrtc)
+          fi
+
+          if [[ "${{ matrix.crypto }}" != "default" ]]; then
+            args+=(--crypto "${{ matrix.crypto }}")
+          fi
+
+          if [[ "${{ matrix.crypto25519 }}" != "default" ]]; then
+            args+=(--crypto25519 "${{ matrix.crypto25519 }}")
+          fi
+
+          python3 .github/run-single-config.py "${args[@]}"
+
       # Don't do it this way.  This causes the main badge to
       # go red if one of the flavors fails.
       ## Trigger testing of more linux flavors
@@ -185,14 +235,14 @@ jobs:
         run: '"${{env.VCPKG_ROOT}}\vcpkg" install --vcpkg-root "${{env.VCPKG_ROOT}}" --triplet=x64-windows'
         shell: cmd
 
-      - name: cmake generate project files
+      - name: Configure CMake (RelWithDebInfo)
         run: |
           mkdir build
           cd build
-          cmake -S .. -G Ninja -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_TOOLS=ON "-DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake" -DUSE_CRYPTO=${{matrix.crypto}}
+          cmake -S .. -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_TOOLS=ON "-DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake" -DUSE_CRYPTO=${{matrix.crypto}}
         shell: cmd
 
-      - name: Build projects
+      - name: Build (RelWithDebInfo)
         working-directory: '${{ github.workspace }}/build'
         run: ninja
         shell: cmd
@@ -204,12 +254,34 @@ jobs:
 
       - name: Test connection
         working-directory: '${{ github.workspace }}/build/bin'
-        run: |
-          rem test_connection.exe suite-quick  -- Loopback throughput test not performing on github hosted runners for some reason
-          test_connection.exe identity quick lane_quick_queueanddrain lane_quick_priority_and_background
+        run: test_connection.exe suite-quick
         shell: cmd
 
       - name: Test p2p
         working-directory: '${{ github.workspace }}/build/bin'
         run: py -3 test_p2p.py --spewlevel=debug --loglevel-p2prendezvous=debug
         shell: cmd
+
+      - name: Configure CMake (Release)
+        run: |
+          mkdir build-release
+          cd build-release
+          cmake -S .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_TOOLS=ON "-DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake" -DUSE_CRYPTO=${{matrix.crypto}}
+        shell: cmd
+
+      - name: Build (Release)
+        working-directory: '${{ github.workspace }}/build-release'
+        run: ninja
+        shell: cmd
+
+      - name: Configure CMake (Debug)
+        run: |
+          mkdir build-debug
+          cd build-debug
+          cmake -S .. -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_TOOLS=ON "-DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake" -DUSE_CRYPTO=${{matrix.crypto}}
+        shell: cmd
+
+      - name: Build (Debug)
+        working-directory: '${{ github.workspace }}/build-debug'
+        run: ninja
+        shell: cmd
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -41,23 +41,15 @@ jobs:
       run: |
         "${VCPKG_ROOT}/vcpkg" install
 
-    - name: Configure CMake
-      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
-      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+    - name: Configure CMake (RelWithDebInfo)
       run: cmake -B ${{github.workspace}}/build
-            -DCMAKE_BUILD_TYPE=Release
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo
             -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake
             -DBUILD_TESTS=ON
+            -DBUILD_EXAMPLES=ON
 
-    - name: Build
-      # Build the program with the given configuration
-      run: cmake --build ${{github.workspace}}/build --config Release
-
-    #- name: Test
-    #  working-directory: ${{github.workspace}}/build
-    #  # Execute tests defined by the CMake configuration.
-    #  # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-    #  run: ctest -C Release
+    - name: Build (RelWithDebInfo)
+      run: cmake --build ${{github.workspace}}/build --config RelWithDebInfo
 
     - name: Test crypto
       working-directory: ${{github.workspace}}/build/bin
@@ -66,5 +58,30 @@ jobs:
 
     - name: Test connection
       working-directory: ${{github.workspace}}/build/bin
-      run: ./test_connection identity quick lane_quick_queueanddrain lane_quick_priority_and_background
+      run: ./test_connection suite-quick
       shell: bash
+
+    - name: Test p2p
+      working-directory: ${{github.workspace}}/build/bin
+      run: python3 test_p2p.py --spewlevel=debug --loglevel-p2prendezvous=debug
+      shell: bash
+
+    - name: Configure CMake (Release)
+      run: cmake -B ${{github.workspace}}/build-release
+            -DCMAKE_BUILD_TYPE=Release
+            -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake
+            -DBUILD_TESTS=ON
+            -DBUILD_EXAMPLES=ON
+
+    - name: Build (Release)
+      run: cmake --build ${{github.workspace}}/build-release --config Release
+
+    - name: Configure CMake (Debug)
+      run: cmake -B ${{github.workspace}}/build-debug
+            -DCMAKE_BUILD_TYPE=Debug
+            -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake
+            -DBUILD_TESTS=ON
+            -DBUILD_EXAMPLES=ON
+
+    - name: Build (Debug)
+      run: cmake --build ${{github.workspace}}/build-debug --config Debug
