Module: wine Branch: master Commit: 12bf088ac0b47b1cc5deb3096856c930b99f8ff4 URL: https://gitlab.winehq.org/wine/wine/-/commit/12bf088ac0b47b1cc5deb3096856c93...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Sep 13 13:01:38 2022 +0200
winetest: Don't require an email if we have a URL.
---
programs/winetest/main.c | 6 +++++- tools/gitlab/test.yml | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 59965526e02..e7b365d2091 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -507,7 +507,8 @@ static void print_version (void) xprintf(", %s", is_elevated ? "elevated" : "not elevated"); xprintf ("\n"); } - xprintf (" Submitter=%s\n", email ); + if (email) + xprintf (" Submitter=%s\n", email ); if (description) xprintf (" Description=%s\n", description ); if (url) @@ -1502,8 +1503,11 @@ int __cdecl main( int argc, char *argv[] )
while (!email) { if (!interactive) + { + if (url) break; report (R_FATAL, "Please specify an email address (-m option) to enable developers\n" " to contact you about your report if necessary."); + } if (guiAskEmail () == IDABORT) exit (1); }
diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index c500a6602d4..a7edd17f447 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -49,7 +49,7 @@ debian-32: needs: - job: build-daily-linux script: - - wine usr/local/lib/wine/i386-windows/winetest.exe -q -t gitlab-$CI_JOB_NAME -m $CI_JOB_URL + - wine usr/local/lib/wine/i386-windows/winetest.exe -q -t gitlab-$CI_JOB_NAME -u $CI_JOB_URL
debian-64: extends: .wine-test @@ -58,4 +58,4 @@ debian-64: needs: - job: build-daily-linux script: - - wine usr/local/lib/wine/x86_64-windows/winetest.exe -q -t gitlab-$CI_JOB_NAME -m $CI_JOB_URL + - wine usr/local/lib/wine/x86_64-windows/winetest.exe -q -t gitlab-$CI_JOB_NAME -u $CI_JOB_URL