daa76aa416
When qemu_set_log_filename() detects an invalid file name, it reports an error, closes the log file (if any), and starts logging to stderr (unless daemonized or nothing is being logged). This is wrong. Asking for an invalid log file on the command line should be fatal. Asking for one in the monitor should fail without messing up an existing logfile. Fix by converting qemu_set_log_filename() to Error. Pass it &error_fatal, except for hmp_logfile report errors. This also permits testing without a subprocess, so do that. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <1466011636-6112-4-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
99 lines
3.3 KiB
C
99 lines
3.3 KiB
C
/*
|
|
* logging unit-tests
|
|
*
|
|
* Copyright (C) 2016 Linaro Ltd.
|
|
*
|
|
* Author: Alex Bennée <alex.bennee@linaro.org>
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
|
|
#include "qemu-common.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/log.h"
|
|
|
|
static void test_parse_range(void)
|
|
{
|
|
Error *err = NULL;
|
|
|
|
qemu_set_dfilter_ranges("0x1000+0x100", &error_abort);
|
|
|
|
g_assert_false(qemu_log_in_addr_range(0xfff));
|
|
g_assert(qemu_log_in_addr_range(0x1000));
|
|
g_assert(qemu_log_in_addr_range(0x1001));
|
|
g_assert(qemu_log_in_addr_range(0x10ff));
|
|
g_assert_false(qemu_log_in_addr_range(0x1100));
|
|
|
|
qemu_set_dfilter_ranges("0x1000-0x100", &error_abort);
|
|
|
|
g_assert_false(qemu_log_in_addr_range(0x1001));
|
|
g_assert(qemu_log_in_addr_range(0x1000));
|
|
g_assert(qemu_log_in_addr_range(0x0f01));
|
|
g_assert_false(qemu_log_in_addr_range(0x0f00));
|
|
|
|
qemu_set_dfilter_ranges("0x1000..0x1100", &error_abort);
|
|
|
|
g_assert_false(qemu_log_in_addr_range(0xfff));
|
|
g_assert(qemu_log_in_addr_range(0x1000));
|
|
g_assert(qemu_log_in_addr_range(0x1100));
|
|
g_assert_false(qemu_log_in_addr_range(0x1101));
|
|
|
|
qemu_set_dfilter_ranges("0x1000..0x1000", &error_abort);
|
|
|
|
g_assert_false(qemu_log_in_addr_range(0xfff));
|
|
g_assert(qemu_log_in_addr_range(0x1000));
|
|
g_assert_false(qemu_log_in_addr_range(0x1001));
|
|
|
|
qemu_set_dfilter_ranges("0x1000+0x100,0x2100-0x100,0x3000..0x3100",
|
|
&error_abort);
|
|
g_assert(qemu_log_in_addr_range(0x1050));
|
|
g_assert(qemu_log_in_addr_range(0x2050));
|
|
g_assert(qemu_log_in_addr_range(0x3050));
|
|
|
|
qemu_set_dfilter_ranges("0x1000+onehundred", &err);
|
|
error_free_or_abort(&err);
|
|
|
|
qemu_set_dfilter_ranges("0x1000+0", &err);
|
|
error_free_or_abort(&err);
|
|
}
|
|
|
|
static void test_parse_path(void)
|
|
{
|
|
Error *err = NULL;
|
|
|
|
qemu_set_log_filename("/tmp/qemu.log", &error_abort);
|
|
qemu_set_log_filename("/tmp/qemu-%d.log", &error_abort);
|
|
qemu_set_log_filename("/tmp/qemu.log.%d", &error_abort);
|
|
|
|
qemu_set_log_filename("/tmp/qemu-%d%d.log", &err);
|
|
error_free_or_abort(&err);
|
|
}
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
g_test_init(&argc, &argv, NULL);
|
|
|
|
g_test_add_func("/logging/parse_range", test_parse_range);
|
|
g_test_add_func("/logging/parse_path", test_parse_path);
|
|
|
|
return g_test_run();
|
|
}
|