diff options
| author | Anthony Liguori <aliguori@amazon.com> | 2014-01-09 11:24:12 -0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2014-01-09 11:24:12 -0800 |
| commit | 666eb032d34961a06713049c56361179903527e4 (patch) | |
| tree | 0352270bd0d4cd62a44b2ca6d269ab9c7f491aff /tests | |
| parent | b61740dbef8d1c8fda8a0f46ecb617e6e865e9e2 (diff) | |
| parent | 5862ad0f55fa54f3ed05774b538a7e862a10941f (diff) | |
| download | qemu-666eb032d34961a06713049c56361179903527e4.zip qemu-666eb032d34961a06713049c56361179903527e4.tar.gz qemu-666eb032d34961a06713049c56361179903527e4.tar.bz2 | |
Merge remote-tracking branch 'mjt/trivial-patches' into staging
* mjt/trivial-patches:
acpi unit-test: Remove temporary disk after test
mainstone: Fix duplicate array values for key 'space'
pxa27x: Add 'const' attribute to keyboard maps
pxa27x: Reduce size of keyboard matrix mapping
doc: Mention chardev:id in available devices for -serial
configure: Python tests must be done before help message
configure: Rewrite code for help message
fix -boot strict regressed in commit 6ef4716
vl: make boot_strict variable static (not used outside vl.c)
x86: only allow real mode to access 32bit without LMA
linux-user: Use macro TARGET_NSIG_WORDS where possible
exynos4210: Use macro ARRAY_SIZE where possible
ui/cocoa: Use macro ARRAY_SIZE where possible
misc: Use macro ARRAY_SIZE where possible
openrisc: Fix spelling in comment (transaltion -> translation)
hw/arm/highbank: Simplify code (memory region in device state)
Message-id: 1388182050-10270-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/acpi-test.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/acpi-test.c b/tests/acpi-test.c index ca83b1d..df1af83 100644 --- a/tests/acpi-test.c +++ b/tests/acpi-test.c @@ -382,6 +382,7 @@ int main(int argc, char *argv[]) { const char *arch = qtest_get_arch(); FILE *f = fopen(disk, "w"); + int ret; fwrite(boot_sector, 1, sizeof boot_sector, f); fclose(f); @@ -390,5 +391,7 @@ int main(int argc, char *argv[]) if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { qtest_add_func("acpi/tcg", test_acpi_tcg); } - return g_test_run(); + ret = g_test_run(); + unlink(disk); + return ret; } |