From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id A4E5A4B62E
for <ffmpegdev@gitmailbox.com>; Wed, 26 Mar 2025 10:30:28 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F0687687B8D;
Wed, 26 Mar 2025 12:30:23 +0200 (EET)
Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com
[209.85.208.174])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE902687B1C
for <ffmpeg-devel@ffmpeg.org>; Wed, 26 Mar 2025 12:30:17 +0200 (EET)
Received: by mail-lj1-f174.google.com with SMTP id
38308e7fff4ca-30762598511so72213191fa.0
for <ffmpeg-devel@ffmpeg.org>; Wed, 26 Mar 2025 03:30:17 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=martin-st.20230601.gappssmtp.com; s=20230601; t=1742985017; x=1743589817;
darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:to
:from:from:to:cc:subject:date:message-id:reply-to;
bh=AtKp8wJATqZnyKiKf8wFPcP774WBzMK/G7NK+piG17U=;
b=yeAYvJ+LU4n6zjb0QYlYkETc4Od4ORJgvO5B3AxHnRPET+yYSsq274nsYEI41kKaUJ
kicEkkc0/Tj3i0JmGxGw9ARnvYEPWAHamHXdLbfw5f7ykTdhnJG9pucdNkS5kI7o/hEQ
peyX3DGGbtQJHZq9PGfDVw20zY1D3lnBgVxJV08g7Pd+Ikt8IGe4K0x3bIvQeL4WwMXW
v2O/J5GyjWaNKGG+20N43jcdEBhNbuSxN87lDANoTBQbGtZE9AqlitOT0pP7mNapkDGV
tajfq4bdWRzYCytJz9iQm6/X48NSz0ElzcLUA8fxLE/uP9ACj3BLlCxEOEfyQ0siMt1C
iA9w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1742985017; x=1743589817;
h=content-transfer-encoding:mime-version:message-id:date:subject:to
:from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=AtKp8wJATqZnyKiKf8wFPcP774WBzMK/G7NK+piG17U=;
b=REP2QOYimRmjm66u/LKHHjAF9auL4zHa1SYW4JmA2qOWIaDejIAE0Ez9dQ7UluukQ9
ESmiWHdDwE74eFGwcE8T3nskWKi60szFx68Fn53H+pNK/EeWosY2SrwbRAgla6kIwQq7
qq8ARFWstigtG2oxAG0bKMkLAapNngoZIbPJ2V3M07U5kRN4+f7h5lihrrORGv9paDj/
oje07ChdSspryW1OSvEjeI5TWYxmbPz6PQe36dmrXic20FyHWyfVjV7kT14oNEMZF9c0
qY7fmO4+mNEtUHCUBwLWh/eaUFezcx6P1gS4SgAOk76GDnHj3AGE6xgbNa0uGMI5GbK1
dFLw==
X-Gm-Message-State: AOJu0YxRIfGOqr1JPNOugccVqOOSt+GA3L7NLa8bBnUfYjLc05BSZSu4
BPqZIufsGGRVBkQMidqlQyypGrYYt+elHWkysNybf8yP2/NRap3IAjARzZ2jLxPBThCyc7aI0dG
Dvw==
X-Gm-Gg: ASbGncu2RlJTIbMwgf8dGBnl2CHBKGtiZhA94SnQWuIeWIMITV6wI4Yund8zomGmV5f
81bhCq+6jUAxeVYSRGMxl3YgsJSq6HNJI4HtXzGLcn3rTW31y33X3axZPsqeu8VIT/a51Yg+mHA
uMqBJWkrsl+Ff6NjEf/AbgUEg7ER+KL5uL3XwhmFnxYVLz56hhqqjBiaWNc4e+EQA3zMjKG8lRE
6Y81ivuEL+Q+9yhrHyiV3QHa6jBJuOOdMFXGv6J/+BOae/cvk3cUpEnSTl4B8godFU+GBek1kPg
mqXAty2zYYyzq9L47x8kPcbnqmhIUDHQ7O5VAXgZ6REPPNiH8NcEufeKlPNyz/yO9CYED0Sgt3D
/5gv96Zw5Klk=
X-Google-Smtp-Source: AGHT+IHPkKiJz0resV/LqLOiWezEGjptgryjTOexpvfVkgqoV+Siag9K77iibXK+t3C3L3I0nm3w7g==
X-Received: by 2002:a2e:a9a7:0:b0:30b:9813:b00d with SMTP id
38308e7fff4ca-30d7e3001f0mr87279151fa.23.1742985016696;
Wed, 26 Mar 2025 03:30:16 -0700 (PDT)
Received: from localhost (dsl-tkubng21-50de30-198.dhcp.inet.fi.
[80.222.48.198]) by smtp.gmail.com with ESMTPSA id
38308e7fff4ca-30d7d7dfddbsm21232731fa.41.2025.03.26.03.30.16
for <ffmpeg-devel@ffmpeg.org>
(version=TLS1 cipher=AES128-SHA bits=128/128);
Wed, 26 Mar 2025 03:30:16 -0700 (PDT)
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
To: ffmpeg-devel@ffmpeg.org
Date: Wed, 26 Mar 2025 12:30:12 +0200
Message-Id: <20250326103015.44296-1-martin@martin.st>
X-Mailer: git-send-email 2.39.5 (Apple Git-154)
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH 1/4] checkasm: Make checkasm_fail_func return
whether we should print verbosely
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250326103015.44296-1-martin@martin.st/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
This makes it easier to implement custom error printouts in tests.
This is a port of dav1d's commit
13a7d78655f8747c2cd01e8a48d44dcc7f60a8e5 into ffmpeg's checkasm.
---
tests/checkasm/checkasm.c | 9 +++++----
tests/checkasm/checkasm.h | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
index 14742081ca..c6d641c52b 100644
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@ -1081,8 +1081,9 @@ int checkasm_bench_func(void)
!wildstrcmp(state.current_func->name, state.bench_pattern);
}
-/* Indicate that the current test has failed */
-void checkasm_fail_func(const char *msg, ...)
+/* Indicate that the current test has failed, return whether verbose printing
+ * is requested. */
+int checkasm_fail_func(const char *msg, ...)
{
if (state.current_func_ver && state.current_func_ver->cpu &&
state.current_func_ver->ok)
@@ -1099,6 +1100,7 @@ void checkasm_fail_func(const char *msg, ...)
state.current_func_ver->ok = 0;
state.num_failed++;
}
+ return state.verbose;
}
void checkasm_set_signal_handler_state(int enabled) {
@@ -1180,8 +1182,7 @@ int checkasm_check_##type(const char *file, int line, \
break; \
if (y == h) \
return 0; \
- checkasm_fail_func("%s:%d", file, line); \
- if (!state.verbose) \
+ if (!checkasm_fail_func("%s:%d", file, line)) \
return 1; \
fprintf(stderr, "%s:\n", name); \
while (h--) { \
diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h
index 75c81317ba..852d6fca64 100644
--- a/tests/checkasm/checkasm.h
+++ b/tests/checkasm/checkasm.h
@@ -152,7 +152,7 @@ struct CheckasmPerf;
void *checkasm_check_func(void *func, const char *name, ...) av_printf_format(2, 3);
int checkasm_bench_func(void);
-void checkasm_fail_func(const char *msg, ...) av_printf_format(1, 2);
+int checkasm_fail_func(const char *msg, ...) av_printf_format(1, 2);
struct CheckasmPerf *checkasm_get_perf_context(void);
void checkasm_report(const char *name, ...) av_printf_format(1, 2);
void checkasm_set_signal_handler_state(int enabled);
--
2.39.5 (Apple Git-154)
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".