From f6872b0c3e4b81eca99087c15dd1449b64a70d65 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Wed, 14 Jul 2021 10:58:16 -0700
Subject: [PATCH] GitLab CI: Produce less test output.

Pass `--output-on-failure` instead of `--verbose` to ctest so that we
produce more relevant output.
---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 83128701d8..59791ecb8b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -345,7 +345,7 @@ Win64 Package:
           aws s3 cp "$package" "$env:S3_DESTINATION_WIN64/"
         }
       }
-    - ctest -C RelWithDebInfo --parallel 3 --force-new-ctest-process --verbose
+    - ctest -C RelWithDebInfo --parallel 3 --force-new-ctest-process --output-on-failure
 
 Win32 Package:
   extends: .build-windows
@@ -392,7 +392,7 @@ Win32 Package:
           aws s3 cp "$package" "$env:S3_DESTINATION_WIN32/"
         }
       }
-    - ctest -C RelWithDebInfo --parallel 3 --force-new-ctest-process --verbose
+    - ctest -C RelWithDebInfo --parallel 3 --force-new-ctest-process --output-on-failure
 
 # Build the User's Guide and Developer's Guide
 Documentation:
@@ -483,7 +483,7 @@ GCC Warnings:
     - ansi2html < ../gcc_report.txt > ../gcc_report.html
     - ninja test-programs
     - chown -R user .
-    - su user -c "ctest --parallel $(getconf _NPROCESSORS_ONLN) --force-new-ctest-process --verbose"
+    - su user -c "ctest --parallel $(getconf _NPROCESSORS_ONLN) --force-new-ctest-process --output-on-failure"
   artifacts:
     paths:
       - gcc_report.html
@@ -532,7 +532,7 @@ Windows Build:
     - cmake -G "Visual Studio 16 2019" -A x64 -DENABLE_LTO=off ..
     - msbuild /verbosity:minimal /maxcpucount Wireshark.sln
     - msbuild /verbosity:minimal /maxcpucount test-programs.vcxproj
-    - ctest -C RelWithDebInfo --parallel 3 --force-new-ctest-process --verbose
+    - ctest -C RelWithDebInfo --parallel 3 --force-new-ctest-process --output-on-failure
 
 # Adapted from https://www.synopsys.com/blogs/software-security/integrating-coverity-scan-with-gitlab-ci/
 # and https://gitlab.gnome.org/GNOME/glib/-/blob/8f57a5b9/.gitlab-ci.yml#L481