diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/acpi-test-data/pc/DSDT | bin | 2970 -> 3028 bytes | |||
| -rw-r--r-- | tests/acpi-test-data/pc/SSDT | bin | 2475 -> 2486 bytes | |||
| -rw-r--r-- | tests/acpi-test-data/pc/SSDT.bridge | bin | 4334 -> 4345 bytes | |||
| -rw-r--r-- | tests/acpi-test-data/q35/DSDT | bin | 7608 -> 7666 bytes | |||
| -rw-r--r-- | tests/acpi-test-data/q35/SSDT | bin | 680 -> 691 bytes | |||
| -rw-r--r-- | tests/acpi-test-data/q35/SSDT.bridge | bin | 697 -> 708 bytes | |||
| -rw-r--r-- | tests/bios-tables-test.c | 2 | ||||
| -rw-r--r-- | tests/check-qjson.c | 15 |
8 files changed, 14 insertions, 3 deletions
diff --git a/tests/acpi-test-data/pc/DSDT b/tests/acpi-test-data/pc/DSDT Binary files differindex 1693c3783b..c658203db9 100644 --- a/tests/acpi-test-data/pc/DSDT +++ b/tests/acpi-test-data/pc/DSDT diff --git a/tests/acpi-test-data/pc/SSDT b/tests/acpi-test-data/pc/SSDT Binary files differindex 59be315237..210d6a71e5 100644 --- a/tests/acpi-test-data/pc/SSDT +++ b/tests/acpi-test-data/pc/SSDT diff --git a/tests/acpi-test-data/pc/SSDT.bridge b/tests/acpi-test-data/pc/SSDT.bridge Binary files differindex fa6136935c..6e6660b1fb 100644 --- a/tests/acpi-test-data/pc/SSDT.bridge +++ b/tests/acpi-test-data/pc/SSDT.bridge diff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT Binary files differindex e9ac11c38f..4723e5954d 100644 --- a/tests/acpi-test-data/q35/DSDT +++ b/tests/acpi-test-data/q35/DSDT diff --git a/tests/acpi-test-data/q35/SSDT b/tests/acpi-test-data/q35/SSDT Binary files differindex e87f5a35c1..0970c67ddb 100644 --- a/tests/acpi-test-data/q35/SSDT +++ b/tests/acpi-test-data/q35/SSDT diff --git a/tests/acpi-test-data/q35/SSDT.bridge b/tests/acpi-test-data/q35/SSDT.bridge Binary files differindex b3cac34d70..a778688617 100644 --- a/tests/acpi-test-data/q35/SSDT.bridge +++ b/tests/acpi-test-data/q35/SSDT.bridge diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 735ac610be..7e85dc45e3 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -17,7 +17,7 @@ #include "qemu-common.h" #include "libqtest.h" #include "qemu/compiler.h" -#include "hw/i386/acpi-defs.h" +#include "hw/acpi/acpi-defs.h" #include "hw/i386/smbios.h" #include "qemu/bitmap.h" diff --git a/tests/check-qjson.c b/tests/check-qjson.c index 95497a037e..60e5b22a98 100644 --- a/tests/check-qjson.c +++ b/tests/check-qjson.c @@ -1,6 +1,6 @@ /* * Copyright IBM, Corp. 2009 - * Copyright (c) 2013 Red Hat Inc. + * Copyright (c) 2013, 2015 Red Hat Inc. * * Authors: * Anthony Liguori <aliguori@us.ibm.com> @@ -1005,6 +1005,7 @@ static void keyword_literal(void) { QObject *obj; QBool *qbool; + QObject *null; QString *str; obj = qobject_from_json("true"); @@ -1041,7 +1042,7 @@ static void keyword_literal(void) g_assert(qbool_get_int(qbool) == 0); QDECREF(qbool); - + obj = qobject_from_jsonf("%i", true); g_assert(obj != NULL); g_assert(qobject_type(obj) == QTYPE_QBOOL); @@ -1050,6 +1051,16 @@ static void keyword_literal(void) g_assert(qbool_get_int(qbool) != 0); QDECREF(qbool); + + obj = qobject_from_json("null"); + g_assert(obj != NULL); + g_assert(qobject_type(obj) == QTYPE_QNULL); + + null = qnull(); + g_assert(null == obj); + + qobject_decref(obj); + qobject_decref(null); } typedef struct LiteralQDictEntry LiteralQDictEntry; |