bcb536cabe
We added @error_warn some two years ago in commit 3ffef1a55c (error:
add global &error_warn destination). It has multiple issues:
* error.h's big comment was not updated for it.
* Function contracts were not updated for it.
* ERRP_GUARD() is unaware of @error_warn, and fails to mask it from
error_prepend() and such. These crash on @error_warn, as pointed
out by Akihiko Odaki.
All fixable. However, after more than two years, we had just of 15
uses, of which the last few patches removed seven as unclean or
otherwise undesirable, adding back five elsewhere. I didn't look
closely enough at the remaining seven to decide whether they are
desirable or not.
I don't think this feature earns its keep. Drop it.
Thanks-to: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-ID: <20250923091000.3180122-14-armbru@redhat.com>
Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
122 lines
2.7 KiB
C
122 lines
2.7 KiB
C
/*
|
|
* Error reporting test
|
|
*
|
|
* Copyright (C) 2022 Red Hat Inc.
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "glib-compat.h"
|
|
#include <locale.h>
|
|
|
|
#include "qemu/error-report.h"
|
|
#include "qapi/error.h"
|
|
|
|
static void
|
|
test_error_report_simple(void)
|
|
{
|
|
if (g_test_subprocess()) {
|
|
error_report("%s", "test error");
|
|
warn_report("%s", "test warn");
|
|
info_report("%s", "test info");
|
|
return;
|
|
}
|
|
|
|
g_test_trap_subprocess(NULL, 0, 0);
|
|
g_test_trap_assert_passed();
|
|
g_test_trap_assert_stderr("\
|
|
test-error-report: test error*\
|
|
test-error-report: warning: test warn*\
|
|
test-error-report: info: test info*\
|
|
");
|
|
}
|
|
|
|
static void
|
|
test_error_report_loc(void)
|
|
{
|
|
if (g_test_subprocess()) {
|
|
loc_set_file("some-file.c", 7717);
|
|
error_report("%s", "test error1");
|
|
loc_set_none();
|
|
error_report("%s", "test error2");
|
|
return;
|
|
}
|
|
|
|
g_test_trap_subprocess(NULL, 0, 0);
|
|
g_test_trap_assert_passed();
|
|
g_test_trap_assert_stderr("\
|
|
test-error-report:some-file.c:7717: test error1*\
|
|
test-error-report: test error2*\
|
|
");
|
|
}
|
|
|
|
static void
|
|
test_error_report_glog(void)
|
|
{
|
|
if (g_test_subprocess()) {
|
|
g_message("gmessage");
|
|
return;
|
|
}
|
|
|
|
g_test_trap_subprocess(NULL, 0, 0);
|
|
g_test_trap_assert_passed();
|
|
g_test_trap_assert_stderr("test-error-report: info: gmessage*");
|
|
}
|
|
|
|
static void
|
|
test_error_report_once(void)
|
|
{
|
|
int i;
|
|
|
|
if (g_test_subprocess()) {
|
|
for (i = 0; i < 3; i++) {
|
|
warn_report_once("warn");
|
|
error_report_once("err");
|
|
}
|
|
return;
|
|
}
|
|
|
|
g_test_trap_subprocess(NULL, 0, 0);
|
|
g_test_trap_assert_passed();
|
|
g_test_trap_assert_stderr("\
|
|
test-error-report: warning: warn*\
|
|
test-error-report: err*\
|
|
");
|
|
}
|
|
|
|
static void
|
|
test_error_report_timestamp(void)
|
|
{
|
|
if (g_test_subprocess()) {
|
|
message_with_timestamp = true;
|
|
warn_report("warn");
|
|
error_report("err");
|
|
return;
|
|
}
|
|
|
|
g_test_trap_subprocess(NULL, 0, 0);
|
|
g_test_trap_assert_passed();
|
|
g_test_trap_assert_stderr("\
|
|
*-*-*:*:* test-error-report: warning: warn*\
|
|
*-*-*:*:* test-error-report: err*\
|
|
");
|
|
}
|
|
|
|
int
|
|
main(int argc, char *argv[])
|
|
{
|
|
setlocale(LC_ALL, "");
|
|
|
|
g_test_init(&argc, &argv, NULL);
|
|
error_init("test-error-report");
|
|
|
|
g_test_add_func("/error-report/simple", test_error_report_simple);
|
|
g_test_add_func("/error-report/loc", test_error_report_loc);
|
|
g_test_add_func("/error-report/glog", test_error_report_glog);
|
|
g_test_add_func("/error-report/once", test_error_report_once);
|
|
g_test_add_func("/error-report/timestamp", test_error_report_timestamp);
|
|
|
|
return g_test_run();
|
|
}
|