From bb756eebdac6fd24e8919e2c43f7d2c8c4091f59 Mon Sep 17 00:00:00 2001 From: RajithaY Date: Tue, 25 Apr 2017 03:31:15 -0700 Subject: Adding qemu as a submodule of KVMFORNFV This Patch includes the changes to add qemu as a submodule to kvmfornfv repo and make use of the updated latest qemu for the execution of all testcase Change-Id: I1280af507a857675c7f81d30c95255635667bdd7 Signed-off-by:RajithaY --- qemu/tests/test-logging.c | 141 ---------------------------------------------- 1 file changed, 141 deletions(-) delete mode 100644 qemu/tests/test-logging.c (limited to 'qemu/tests/test-logging.c') diff --git a/qemu/tests/test-logging.c b/qemu/tests/test-logging.c deleted file mode 100644 index ac8deedc9..000000000 --- a/qemu/tests/test-logging.c +++ /dev/null @@ -1,141 +0,0 @@ -/* - * logging unit-tests - * - * Copyright (C) 2016 Linaro Ltd. - * - * Author: Alex Bennée - * - * 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 - -#include "qemu-common.h" -#include "include/qemu/log.h" - -static void test_parse_range(void) -{ - qemu_set_dfilter_ranges("0x1000+0x100"); - - 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"); - - 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"); - - 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"); - - 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"); - g_assert(qemu_log_in_addr_range(0x1050)); - g_assert(qemu_log_in_addr_range(0x2050)); - g_assert(qemu_log_in_addr_range(0x3050)); -} - -#ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS -static void test_parse_invalid_range_subprocess(void) -{ - qemu_set_dfilter_ranges("0x1000+onehundred"); -} -static void test_parse_invalid_range(void) -{ - g_test_trap_subprocess("/logging/parse_invalid_range/subprocess", 0, 0); - g_test_trap_assert_failed(); - g_test_trap_assert_stdout(""); - g_test_trap_assert_stderr("*Failed to parse range in: 0x1000+onehundred\n"); -} -static void test_parse_zero_range_subprocess(void) -{ - qemu_set_dfilter_ranges("0x1000+0"); -} -static void test_parse_zero_range(void) -{ - g_test_trap_subprocess("/logging/parse_zero_range/subprocess", 0, 0); - g_test_trap_assert_failed(); - g_test_trap_assert_stdout(""); - g_test_trap_assert_stderr("*Failed to parse range in: 0x1000+0\n"); -} - -/* As the only real failure from a bad log filename path spec is - * reporting to the user we have to use the g_test_trap_subprocess - * mechanism and check no errors reported on stderr. - */ -static void test_parse_path_subprocess(void) -{ - /* All these should work without issue */ - qemu_set_log_filename("/tmp/qemu.log"); - qemu_set_log_filename("/tmp/qemu-%d.log"); - qemu_set_log_filename("/tmp/qemu.log.%d"); -} -static void test_parse_path(void) -{ - g_test_trap_subprocess ("/logging/parse_path/subprocess", 0, 0); - g_test_trap_assert_passed(); - g_test_trap_assert_stdout(""); - g_test_trap_assert_stderr(""); -} -static void test_parse_invalid_path_subprocess(void) -{ - qemu_set_log_filename("/tmp/qemu-%d%d.log"); -} -static void test_parse_invalid_path(void) -{ - g_test_trap_subprocess ("/logging/parse_invalid_path/subprocess", 0, 0); - g_test_trap_assert_passed(); - g_test_trap_assert_stdout(""); - g_test_trap_assert_stderr("Bad logfile format: /tmp/qemu-%d%d.log\n"); -} -#endif /* CONFIG_HAS_GLIB_SUBPROCESS_TESTS */ - -int main(int argc, char **argv) -{ - g_test_init(&argc, &argv, NULL); - - g_test_add_func("/logging/parse_range", test_parse_range); -#ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS - g_test_add_func("/logging/parse_invalid_range/subprocess", test_parse_invalid_range_subprocess); - g_test_add_func("/logging/parse_invalid_range", test_parse_invalid_range); - g_test_add_func("/logging/parse_zero_range/subprocess", test_parse_zero_range_subprocess); - g_test_add_func("/logging/parse_zero_range", test_parse_zero_range); - g_test_add_func("/logging/parse_path", test_parse_path); - g_test_add_func("/logging/parse_path/subprocess", test_parse_path_subprocess); - g_test_add_func("/logging/parse_invalid_path", test_parse_invalid_path); - g_test_add_func("/logging/parse_invalid_path/subprocess", test_parse_invalid_path_subprocess); -#endif - - return g_test_run(); -} -- cgit 1.2.3-korg