From 304442655c51ae307628091ea7405d4065792f83 Mon Sep 17 00:00:00 2001 From: Aaron Culliney Date: Mon, 28 Apr 2014 11:55:51 -0700 Subject: [PATCH] Attempt to load non-gzipped test disks (aborted from previous runs) --- src/test/testdisplay.c | 9 +++++++-- src/test/testvm.c | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/test/testdisplay.c b/src/test/testdisplay.c index 95cd4215..ac641fd3 100644 --- a/src/test/testdisplay.c +++ b/src/test/testdisplay.c @@ -43,8 +43,13 @@ static void sha1_to_str(const uint8_t * const md, char *buf) { } TEST test_boot_disk() { - char *disk = "./disks/testdisplay1.dsk.gz"; - ASSERT(!c_new_diskette_6(0, disk, 0)); + char *disk = strdup("./disks/testdisplay1.dsk.gz"); + if (c_new_diskette_6(0, disk, 0)) { + int len = strlen(disk); + disk[len-3] = '\0'; + ASSERT(!c_new_diskette_6(0, disk, 0)); + } + free(disk); BOOT_TO_DOS(); diff --git a/src/test/testvm.c b/src/test/testvm.c index 5035e1d6..7a2c049c 100644 --- a/src/test/testvm.c +++ b/src/test/testvm.c @@ -49,8 +49,13 @@ static void sha1_to_str(const uint8_t * const md, char *buf) { // VM TESTS ... TEST test_boot_disk() { - char *disk = "./disks/testvm1.dsk.gz"; - ASSERT(!c_new_diskette_6(0, disk, 0)); + char *disk = strdup("./disks/testvm1.dsk.gz"); + if (c_new_diskette_6(0, disk, 0)) { + int len = strlen(disk); + disk[len-3] = '\0'; + ASSERT(!c_new_diskette_6(0, disk, 0)); + } + free(disk); BOOT_TO_DOS();