From 050d1de389861a1bb37c1c2c2af59f936291c5af Mon Sep 17 00:00:00 2001 From: Aaron Culliney Date: Tue, 25 Nov 2014 21:32:28 -0800 Subject: [PATCH] HIRES PAGE2 test: shows moire on page2 --- disks/testdisplay1.dsk.gz | Bin 30894 -> 31060 bytes src/test/testdisplay.c | 23 +++++++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/disks/testdisplay1.dsk.gz b/disks/testdisplay1.dsk.gz index 4486d85c62eaa9732b31e1a854d8605c297f984c..41ace7e1a9789c60dc69e35977160e9aa9da9876 100644 GIT binary patch delta 11082 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 delta 10932 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 F_h0#xkiY-{ diff --git a/src/test/testdisplay.c b/src/test/testdisplay.c index 28b36fb6..687b2345 100644 --- a/src/test/testdisplay.c +++ b/src/test/testdisplay.c @@ -200,6 +200,7 @@ TEST test_lores_80colmix_inverse() { // // NOTE : These tests assume standard color mode (not b/w or interpolated) // +#define MOIRE_SHA "1A5DD96B7E3538C2C3625A37653E013E3998F825" TEST test_hires_with_80col() { BOOT_TO_DOS(); @@ -210,7 +211,7 @@ TEST test_hires_with_80col() { c_debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); - ASSERT_SHA("1A5DD96B7E3538C2C3625A37653E013E3998F825"); + ASSERT_SHA(MOIRE_SHA); PASS(); } @@ -223,7 +224,20 @@ TEST test_hires_with_40col() { c_debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); - ASSERT_SHA("1A5DD96B7E3538C2C3625A37653E013E3998F825"); + ASSERT_SHA(MOIRE_SHA); + + PASS(); +} + +TEST test_hires_with_40col_page2() { + BOOT_TO_DOS(); + + ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); + test_type_input("RUN TESTHIRES_PG2\r"); + c_debugger_go(); + + ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); + ASSERT_SHA(MOIRE_SHA); PASS(); } @@ -394,6 +408,11 @@ static void *test_thread(void *dummyptr) { RUN_TEST(test_hires_with_40col); test_do_reboot = true; + RUN_TEST(test_hires_with_40col_page2); + test_do_reboot = false; + RUN_TEST(test_hires_with_40col_page2); + test_do_reboot = true; + RUN_TEST(test_hires_40colmix_normal); test_do_reboot = false; RUN_TEST(test_hires_40colmix_normal);