Add QTest testcase for the Intel Hexadecimal

'test.hex' file is a memory test pattern stored in Hexadecimal Object
Format.  It loads at 0x10000 in RAM and contains values from 0 through
255.

The test case verifies that the expected memory test pattern was loaded.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Suggested-by: Steffen Gortz <qemu.ml@steffen-goertz.de>
Suggested-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Su Hang <suhang16@mails.ucas.ac.cn>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
[PMM: changed qtest_startf() to qtest_initf() to work with
 current master after the refactoring in commit 88b988c895]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Su Hang 2018-08-16 14:05:28 +01:00 committed by Peter Maydell
parent e4a25ed919
commit 645d3cbebb
5 changed files with 75 additions and 0 deletions

View File

@ -1323,6 +1323,12 @@ F: hw/core/generic-loader.c
F: include/hw/core/generic-loader.h
F: docs/generic-loader.txt
Intel Hexadecimal Object File Loader
M: Su Hang <suhang16@mails.ucas.ac.cn>
S: Maintained
F: tests/hexloader-test.c
F: tests/hex-loader-check-data/test.hex
CHRP NVRAM
M: Thomas Huth <thuth@redhat.com>
S: Maintained

4
configure vendored
View File

@ -7382,6 +7382,10 @@ for test_file in $(find $source_path/tests/acpi-test-data -type f)
do
FILES="$FILES tests/acpi-test-data$(echo $test_file | sed -e 's/.*acpi-test-data//')"
done
for test_file in $(find $source_path/tests/hex-loader-check-data -type f)
do
FILES="$FILES tests/hex-loader-check-data$(echo $test_file | sed -e 's/.*hex-loader-check-data//')"
done
mkdir -p $DIRS
for f in $FILES ; do
if [ -e "$source_path/$f" ] && [ "$pwd_is_source_path" != "y" ]; then

View File

@ -386,6 +386,7 @@ check-qtest-arm-y += tests/test-arm-mptimer$(EXESUF)
gcov-files-arm-y += hw/timer/arm_mptimer.c
check-qtest-arm-y += tests/boot-serial-test$(EXESUF)
check-qtest-arm-y += tests/sdhci-test$(EXESUF)
check-qtest-arm-y += tests/hexloader-test$(EXESUF)
check-qtest-aarch64-y = tests/numa-test$(EXESUF)
check-qtest-aarch64-y += tests/sdhci-test$(EXESUF)
@ -773,6 +774,7 @@ tests/qmp-test$(EXESUF): tests/qmp-test.o
tests/device-introspect-test$(EXESUF): tests/device-introspect-test.o
tests/rtc-test$(EXESUF): tests/rtc-test.o
tests/m48t59-test$(EXESUF): tests/m48t59-test.o
tests/hexloader-test$(EXESUF): tests/hexloader-test.o
tests/endianness-test$(EXESUF): tests/endianness-test.o
tests/spapr-phb-test$(EXESUF): tests/spapr-phb-test.o $(libqos-obj-y)
tests/prom-env-test$(EXESUF): tests/prom-env-test.o $(libqos-obj-y)

View File

@ -0,0 +1,18 @@
:020000040001F9
:10000000000102030405060708090a0b0c0d0e0f78
:10001000101112131415161718191a1b1c1d1e1f68
:10002000202122232425262728292a2b2c2d2e2f58
:10003000303132333435363738393a3b3c3d3e3f48
:10004000404142434445464748494a4b4c4d4e4f38
:10005000505152535455565758595a5b5c5d5e5f28
:10006000606162636465666768696a6b6c6d6e6f18
:10007000707172737475767778797a7b7c7d7e7f08
:10008000808182838485868788898a8b8c8d8e8ff8
:10009000909192939495969798999a9b9c9d9e9fe8
:1000a000a0a1a2a3a4a5a6a7a8a9aaabacadaeafd8
:1000b000b0b1b2b3b4b5b6b7b8b9babbbcbdbebfc8
:1000c000c0c1c2c3c4c5c6c7c8c9cacbcccdcecfb8
:1000d000d0d1d2d3d4d5d6d7d8d9dadbdcdddedfa8
:1000e000e0e1e2e3e4e5e6e7e8e9eaebecedeeef98
:1000f000f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff88
:00000001FF

45
tests/hexloader-test.c Normal file
View File

@ -0,0 +1,45 @@
/*
* QTest testcase for the Intel Hexadecimal Object File Loader
*
* Authors:
* Su Hang <suhang16@mails.ucas.ac.cn> 2018
*
* 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 "libqtest.h"
/* Load 'test.hex' and verify that the in-memory contents are as expected.
* 'test.hex' is a memory test pattern stored in Hexadecimal Object
* format. It loads at 0x10000 in RAM and contains values from 0 through
* 255.
*/
static void hex_loader_test(void)
{
unsigned int i;
const unsigned int base_addr = 0x00010000;
QTestState *s = qtest_initf(
"-M vexpress-a9 -nographic -device loader,file=tests/hex-loader-check-data/test.hex");
for (i = 0; i < 256; ++i) {
uint8_t val = qtest_readb(s, base_addr + i);
g_assert_cmpuint(i, ==, val);
}
qtest_quit(s);
}
int main(int argc, char **argv)
{
int ret;
g_test_init(&argc, &argv, NULL);
qtest_add_func("/tmp/hex_loader", hex_loader_test);
ret = g_test_run();
return ret;
}