From 31b87f67e4fecc63bf91b4f164931ebaf7ff28ec Mon Sep 17 00:00:00 2001
From: Aaron Culliney <asc_at_bitr0t_com>
Date: Sat, 1 Nov 2014 18:44:54 -0700
Subject: [PATCH] Refactor test_setup_boot_disk

---
 src/test/testcommon.c  | 6 +++---
 src/test/testcommon.h  | 2 +-
 src/test/testdisplay.c | 2 +-
 src/test/testvm.c      | 5 +----
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/test/testcommon.c b/src/test/testcommon.c
index 51cb03e3..d07abc7c 100644
--- a/src/test/testcommon.c
+++ b/src/test/testcommon.c
@@ -144,7 +144,7 @@ void test_common_init(bool do_cputhread) {
     }
 }
 
-int setup_boot_disk(const char *fileName) {
+int test_setup_boot_disk(const char *fileName, int readonly) {
     char *disk = NULL;
     int err = 0;
 #ifdef __APPLE__
@@ -164,10 +164,10 @@ int setup_boot_disk(const char *fileName) {
 #else
     asprintf(&disk, "./disks/%s", fileName);
 #endif
-    if (c_new_diskette_6(0, disk, 0)) {
+    if (c_new_diskette_6(0, disk, readonly)) {
         int len = strlen(disk);
         disk[len-3] = '\0';
-        err = (c_new_diskette_6(0, disk, 0) != NULL);
+        err = (c_new_diskette_6(0, disk, readonly) != NULL);
     }
     FREE(disk);
     return err;
diff --git a/src/test/testcommon.h b/src/test/testcommon.h
index 2c536a52..551cbd0d 100644
--- a/src/test/testcommon.h
+++ b/src/test/testcommon.h
@@ -52,6 +52,6 @@ void test_breakpoint(void *arg);
 void test_common_init(bool do_cputhread);
 void test_common_setup();
 void test_type_input(const char *input);
-int setup_boot_disk(const char *fileName);
+int test_setup_boot_disk(const char *fileName, int readonly);
 
 #endif // whole file
diff --git a/src/test/testdisplay.c b/src/test/testdisplay.c
index 21e22a1e..34c8bc79 100644
--- a/src/test/testdisplay.c
+++ b/src/test/testdisplay.c
@@ -41,7 +41,7 @@ static void sha1_to_str(const uint8_t * const md, char *buf) {
 }
 
 TEST test_boot_disk() {
-    setup_boot_disk("testdisplay1.dsk.gz");
+    test_setup_boot_disk("testdisplay1.dsk.gz", 1);
 
     BOOT_TO_DOS();
 
diff --git a/src/test/testvm.c b/src/test/testvm.c
index 8e6db8f8..6fa19d30 100644
--- a/src/test/testvm.c
+++ b/src/test/testvm.c
@@ -29,6 +29,7 @@ static void testvm_setup(void *arg) {
     apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00;
     apple_ii_64k[0][TESTOUT_ADDR] = 0x00;
     joy_button0 = 0xff; // OpenApple
+    test_setup_boot_disk(TESTING_DISK, 1);
     if (test_do_reboot) {
         cpu65_interrupt(ResetSig);
     }
@@ -51,8 +52,6 @@ static void sha1_to_str(const uint8_t * const md, char *buf) {
 #define EXPECTED_DISK_TRACE_FILE_SIZE 60961
 #define EXPECTED_DISK_TRACE_SHA "D21CC686571ADE868A909B5A7044A973DE70DFFB"
 TEST test_boot_disk_bytes() {
-    setup_boot_disk(TESTING_DISK);
-
     char *homedir = getenv("HOME");
     char *disk = NULL;
     asprintf(&disk, "%s/a2_read_disk_test.raw", homedir);
@@ -96,8 +95,6 @@ TEST test_boot_disk_bytes() {
 #define EXPECTED_CPU_TRACE_FILE_SIZE 87611579
 #define EXPECTED_CPU_TRACE_SHA "8DE74ED640E0CE4AB1AAC40E95BE9B8507A37434"
 TEST test_boot_disk_cputrace() {
-    setup_boot_disk(TESTING_DISK);
-
     char *homedir = getenv("HOME");
     char *output = NULL;
     asprintf(&output, "%s/a2_cputrace.raw", homedir);