Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-01-13 12:31:25 +00:00
Code Issues Projects Releases Wiki Activity

Improve display testing

Browse Source 
- Also test graphics modes in COLOR_MODE_BW
    - Changed TESTHIRES80_2 to merge the two portions of the HIRES80 picture data
    - New TESTLORES_2 and TESTLORES80_2 that draws colors/patterns that better showcase continuous pixel data
This commit is contained in:
Aaron Culliney 2018-08-11 15:57:32 -07:00
parent 6ee8699079
commit 9f1ef968ac
3 changed files with 250 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
disks/testdisplay1.dsk.gz
View File

Binary file not shown.

26
src/test/testcommon.h
View File

@ -46,23 +46,17 @@ void sha1_to_str(const uint8_t * const md, char *buf);
static inline bool _matchFramebufferSHA(const char *SHA_STR, bool is_old) { static inline bool _matchFramebufferSHA(const char *SHA_STR, bool is_old) {
uint8_t md[SHA_DIGEST_LENGTH]; uint8_t md[SHA_DIGEST_LENGTH];
bool matches = false; uint8_t *fb = NULL;
for (unsigned int i=0; i<2; i++) { // HACK: pump for at least 2 video frames to accommodate testing loading state if (is_old) {
uint8_t *fb = NULL; extern uint8_t *display_renderStagingFramebuffer(void);
if (is_old) { fb = display_renderStagingFramebuffer();
extern uint8_t *display_renderStagingFramebuffer(void); } else {
fb = display_renderStagingFramebuffer(); fb = display_waitForNextCompleteFramebuffer();
} else {
fb = display_waitForNextCompleteFramebuffer();
}
SHA1(fb, SCANWIDTH*SCANHEIGHT, md);
sha1_to_str(md, mdstr);
matches = strcasecmp(mdstr, SHA_STR) == 0;
if (matches) {
break;
}
} }
SHA1(fb, SCANWIDTH*SCANHEIGHT, md);
sha1_to_str(md, mdstr);
bool matches = strcasecmp(mdstr, SHA_STR) == 0;
return matches; return matches;
} }

349
src/test/testdisplay.c
View File

@ -12,6 +12,7 @@
#include "testcommon.h" #include "testcommon.h"
static bool test_thread_running = false; static bool test_thread_running = false;
static color_mode_t test_color_mode = COLOR_MODE_COLOR;
extern pthread_mutex_t interface_mutex; // TODO FIXME : raw access to CPU mutex because stepping debugger ... extern pthread_mutex_t interface_mutex; // TODO FIXME : raw access to CPU mutex because stepping debugger ...
@ -24,9 +25,13 @@ static void testdisplay_setup(void *arg) {
if (test_do_reboot) { if (test_do_reboot) {
cpu65_interrupt(ResetSig); cpu65_interrupt(ResetSig);
} }
prefs_setLongValue(PREF_DOMAIN_VIDEO, PREF_COLOR_MODE, test_color_mode);
prefs_sync(PREF_DOMAIN_VIDEO);
} }
static void testdisplay_teardown(void *arg) { static void testdisplay_teardown(void *arg) {
test_color_mode = COLOR_MODE_COLOR;
test_do_reboot = true;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -42,7 +47,6 @@ static void testdisplay_teardown(void *arg) {
# if CONFORMANT_TRACKS # if CONFORMANT_TRACKS
TEST test_boot_video_trace(void) { TEST test_boot_video_trace(void) {
srandom(0);
const char *homedir = HOMEDIR; const char *homedir = HOMEDIR;
char *traceFile = NULL; char *traceFile = NULL;
ASPRINTF(&traceFile, "%s/a2_boot_video_trace.txt", homedir); ASPRINTF(&traceFile, "%s/a2_boot_video_trace.txt", homedir);
@ -86,13 +90,13 @@ TEST test_boot_video_trace(void) {
# undef EXPECTED_BOOT_VIDEO_TRACE_FILE_SHA # undef EXPECTED_BOOT_VIDEO_TRACE_FILE_SHA
# define EXPECTED_TRACE_40COL_FILE_SIZ 698230 # define EXPECTED_TRACE_40COL_FILE_SIZ 698230
# define EXPECTED_TRACE_40COL_FILE_SHA "03dd130fa58c068d2434cf7fa244f64ec058290b" # define EXPECTED_TRACE_40COL_FILE_SHA "2B8C050F84776A78F73A7AE803A474820E11B3C1"
TEST test_video_trace_40col(void) { TEST test_video_trace_40col(void) {
BOOT_TO_DOS(); BOOT_TO_DOS();
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED);
test_type_input("CATALOG\rPOKE7987,255:REM TRIGGER DEBUGGER\r"); test_type_input("CATALOG\r\rPOKE7987,255:REM TRIGGER DEBUGGER\r");
c_debugger_go(); c_debugger_go();
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0;
@ -264,10 +268,6 @@ TEST test_80col_inverse() {
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// LORES // LORES
// //
// 2014/04/05 NOTE : Tests may be successful but graphics display appears to be somewhat b0rken
//
// NOTE : These tests assume standard color mode (not b/w or interpolated)
//
TEST test_lores_with_80col() { TEST test_lores_with_80col() {
BOOT_TO_DOS(); BOOT_TO_DOS();
@ -278,11 +278,15 @@ TEST test_lores_with_80col() {
c_debugger_go(); c_debugger_go();
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
#if !CONFORMANT_TRACKS
ASSERT_SHA("7B642FF04DE03142A2CE1062C28A4D92E492EDDC");
#endif
WAIT_FOR_FB_SHA("09C732B37F9E482C8CBE38DA97C99EE640EB8913"); if (test_color_mode == COLOR_MODE_BW) {
WAIT_FOR_FB_SHA("DED166782E9C529B6D7DB2EEBFF5877AD49C4C1F");
} else {
#if !CONFORMANT_TRACKS
ASSERT_SHA("7B642FF04DE03142A2CE1062C28A4D92E492EDDC");
#endif
WAIT_FOR_FB_SHA("09C732B37F9E482C8CBE38DA97C99EE640EB8913");
}
PASS(); PASS();
} }
@ -296,10 +300,33 @@ TEST test_lores_with_40col() {
c_debugger_go(); c_debugger_go();
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA_OLD("D7DC78F5718B4CF8716614E79ADABCAB919FCE5D");
WAIT_FOR_FB_SHA("36287232F7FD4574AA5E05F1C6CACB598C9C2903"); if (test_color_mode == COLOR_MODE_BW) {
ASSERT_SHA ("36287232F7FD4574AA5E05F1C6CACB598C9C2903"); // stable through next frame WAIT_FOR_FB_SHA("270B44B639E062B1DC7C2EB2E561051130F5F790");
} else {
ASSERT_SHA_OLD("D7DC78F5718B4CF8716614E79ADABCAB919FCE5D");
WAIT_FOR_FB_SHA("36287232F7FD4574AA5E05F1C6CACB598C9C2903");
ASSERT_SHA ("36287232F7FD4574AA5E05F1C6CACB598C9C2903"); // stable through next frame
}
PASS();
}
TEST test_lores_with_40col_2() {
BOOT_TO_DOS();
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED);
test_type_input("RUNTESTLORES_2\r");
c_debugger_go();
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
if (test_color_mode == COLOR_MODE_BW) {
WAIT_FOR_FB_SHA("A3D5F5DF7A2DF15DDDF7E82F83B756827CD142D3");
} else {
WAIT_FOR_FB_SHA("D7CC29D2030230258FAFF3772C8F9AD2B318D190");
}
PASS(); PASS();
} }
@ -313,11 +340,15 @@ TEST test_lores_40colmix_normal() {
c_debugger_go(); c_debugger_go();
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
#if !CONFORMANT_TRACKS
ASSERT_SHA("9097A6AE967E4501B40C7CD7EEE115B8C478B345");
#endif
WAIT_FOR_FB_SHA("B460804F69A416D78462818493933BA2FFEB70C8"); if (test_color_mode == COLOR_MODE_BW) {
WAIT_FOR_FB_SHA("373799861AFCA845826C27571D2FFF7F1CB69BD6");
} else {
#if !CONFORMANT_TRACKS
ASSERT_SHA("9097A6AE967E4501B40C7CD7EEE115B8C478B345");
#endif
WAIT_FOR_FB_SHA("B460804F69A416D78462818493933BA2FFEB70C8");
}
PASS(); PASS();
} }
@ -331,10 +362,14 @@ TEST test_lores_40colmix_inverse() {
c_debugger_go(); c_debugger_go();
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA_OLD("5256E8B96CB04F48324B587ECCCF8A435077B5DE");
WAIT_FOR_FB_SHA("C2ADD78885B65F7D2FA84F999B06CB32D25EF8A0"); if (test_color_mode == COLOR_MODE_BW) {
ASSERT_SHA ("C2ADD78885B65F7D2FA84F999B06CB32D25EF8A0"); // stable through next frame WAIT_FOR_FB_SHA("F9F4757BB751AD47D975D45DC75B3C93C9F2C6C8");
} else {
ASSERT_SHA_OLD("5256E8B96CB04F48324B587ECCCF8A435077B5DE");
WAIT_FOR_FB_SHA("C2ADD78885B65F7D2FA84F999B06CB32D25EF8A0");
ASSERT_SHA ("C2ADD78885B65F7D2FA84F999B06CB32D25EF8A0"); // stable through next frame
}
PASS(); PASS();
} }
@ -348,10 +383,14 @@ TEST test_lores_80colmix_normal() {
c_debugger_go(); c_debugger_go();
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA_OLD("9D5D5382B0A18A71DC135CAD51BEA2665ADB5FB2");
WAIT_FOR_FB_SHA("610E61D466AAE88CF694B3E1029D3D4C28D1D820"); if (test_color_mode == COLOR_MODE_BW) {
ASSERT_SHA ("610E61D466AAE88CF694B3E1029D3D4C28D1D820"); // stable through next frame WAIT_FOR_FB_SHA("DD2A3A05EA38652A86D144FFB5BD98CB24A82FF6");
} else {
ASSERT_SHA_OLD("9D5D5382B0A18A71DC135CAD51BEA2665ADB5FB2");
WAIT_FOR_FB_SHA("610E61D466AAE88CF694B3E1029D3D4C28D1D820");
ASSERT_SHA ("610E61D466AAE88CF694B3E1029D3D4C28D1D820"); // stable through next frame
}
PASS(); PASS();
} }
@ -365,10 +404,14 @@ TEST test_lores_80colmix_inverse() {
c_debugger_go(); c_debugger_go();
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA_OLD("7936E87BE1F920AACD43268DB288746528E89959");
WAIT_FOR_FB_SHA("CBAEE8961F20079BF45CD197878F1111A6E89E26"); if (test_color_mode == COLOR_MODE_BW) {
ASSERT_SHA ("CBAEE8961F20079BF45CD197878F1111A6E89E26"); // stable through next frame WAIT_FOR_FB_SHA("0D51D6A375820FE36E4D95127F0E7A8F71495F4A");
} else {
ASSERT_SHA_OLD("7936E87BE1F920AACD43268DB288746528E89959");
WAIT_FOR_FB_SHA("CBAEE8961F20079BF45CD197878F1111A6E89E26");
ASSERT_SHA ("CBAEE8961F20079BF45CD197878F1111A6E89E26"); // stable through next frame
}
PASS(); PASS();
} }
@ -376,9 +419,9 @@ TEST test_lores_80colmix_inverse() {
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// HIRES // HIRES
// //
// NOTE : These tests assume standard color mode (not b/w or interpolated)
//
#define MOIRE_SHA "1A5DD96B7E3538C2C3625A37653E013E3998F825" #define MOIRE_SHA "1A5DD96B7E3538C2C3625A37653E013E3998F825"
#define MOIRE_SHA_BW "DCB2BADC290A9E0A1DF0DEC45D3A653A40AF8B6B"
TEST test_hires_with_80col() { TEST test_hires_with_80col() {
BOOT_TO_DOS(); BOOT_TO_DOS();
@ -389,7 +432,12 @@ TEST test_hires_with_80col() {
c_debugger_go(); c_debugger_go();
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA(MOIRE_SHA);
if (test_color_mode == COLOR_MODE_BW) {
ASSERT_SHA(MOIRE_SHA_BW);
} else {
ASSERT_SHA(MOIRE_SHA);
}
PASS(); PASS();
} }
@ -402,7 +450,12 @@ TEST test_hires_with_40col() {
c_debugger_go(); c_debugger_go();
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA(MOIRE_SHA);
if (test_color_mode == COLOR_MODE_BW) {
ASSERT_SHA(MOIRE_SHA_BW);
} else {
ASSERT_SHA(MOIRE_SHA);
}
PASS(); PASS();
} }
@ -416,11 +469,11 @@ TEST test_hires_with_40col_page2() {
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
// FIXME TODO ... pump CPU until frame complete a few times ... should check All The SHAs here ... if (test_color_mode == COLOR_MODE_BW) {
display_waitForNextCompleteFramebuffer(); WAIT_FOR_FB_SHA(MOIRE_SHA_BW);
display_waitForNextCompleteFramebuffer(); } else {
WAIT_FOR_FB_SHA(MOIRE_SHA);
ASSERT_SHA(MOIRE_SHA); }
PASS(); PASS();
} }
@ -433,7 +486,12 @@ TEST test_hires_40colmix_normal() {
c_debugger_go(); c_debugger_go();
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA("37F41F74EB23F8812498F732E6DA34A0EBC4D68A");
if (test_color_mode == COLOR_MODE_BW) {
ASSERT_SHA("9611721C0F70C5F1FE0172534EC15B977CB099D4");
} else {
ASSERT_SHA("37F41F74EB23F8812498F732E6DA34A0EBC4D68A");
}
PASS(); PASS();
} }
@ -446,7 +504,12 @@ TEST test_hires_40colmix_inverse() {
c_debugger_go(); c_debugger_go();
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA("253D1823F5DAC0300B46B3D49C04CD59CC70076F");
if (test_color_mode == COLOR_MODE_BW) {
ASSERT_SHA("5CFA5789735AD09FAB8CC7B6EE44CE22CF64A70D");
} else {
ASSERT_SHA("253D1823F5DAC0300B46B3D49C04CD59CC70076F");
}
PASS(); PASS();
} }
@ -459,7 +522,12 @@ TEST test_hires_80colmix_normal() {
c_debugger_go(); c_debugger_go();
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
WAIT_FOR_FB_SHA("8D02F9A7CFC7A7E6D836B01862389F55E877E4E6");
if (test_color_mode == COLOR_MODE_BW) {
WAIT_FOR_FB_SHA("4069102016E4E6AA860A32C6BAC5E4A6C6A45B72");
} else {
WAIT_FOR_FB_SHA("8D02F9A7CFC7A7E6D836B01862389F55E877E4E6");
}
PASS(); PASS();
} }
@ -472,15 +540,23 @@ TEST test_hires_80colmix_inverse() {
c_debugger_go(); c_debugger_go();
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
#if !CONFORMANT_TRACKS
ASSERT_SHA("FAFBB65013DA3D5173487C3F434C36A7C04DE92E");
#endif
WAIT_FOR_FB_SHA("30C0329061781FD1BFE214940F9D5EDFA5FA5F08"); if (test_color_mode == COLOR_MODE_BW) {
WAIT_FOR_FB_SHA("C3C19FB3258E7A58F81BC3DC51C2AEDFFC836285");
} else {
#if !CONFORMANT_TRACKS
ASSERT_SHA("FAFBB65013DA3D5173487C3F434C36A7C04DE92E");
#endif
WAIT_FOR_FB_SHA("30C0329061781FD1BFE214940F9D5EDFA5FA5F08");
}
PASS(); PASS();
} }
// ----------------------------------------------------------------------------
// 80LORES & 80HIRES
//
TEST test_80col_lores() { TEST test_80col_lores() {
BOOT_TO_DOS(); BOOT_TO_DOS();
@ -489,7 +565,30 @@ TEST test_80col_lores() {
c_debugger_go(); c_debugger_go();
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA("5BFF6721FB90B3A6AF88D9021A013C007C4AF23A");
if (test_color_mode == COLOR_MODE_BW) {
ASSERT_SHA("D8238DC3ACC1A0E191CEC06F505A159993C2EBFA");
} else {
ASSERT_SHA("5BFF6721FB90B3A6AF88D9021A013C007C4AF23A");
}
PASS();
}
TEST test_80col_lores_2() {
BOOT_TO_DOS();
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED);
test_type_input("RUN TESTLORES80_2\r");
c_debugger_go();
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
if (test_color_mode == COLOR_MODE_BW) {
ASSERT_SHA("5B99DE77F81AD8718FCFB735215A37F7B5ED5DE7");
} else {
ASSERT_SHA("98BB7C04854594D9E709302EF29905D2A89F1D34");
}
PASS(); PASS();
} }
@ -502,13 +601,12 @@ TEST test_80col_hires() {
c_debugger_go(); c_debugger_go();
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA("B48F940B1566607E2557A50B98C6C87FFF0C05B2");
apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; if (test_color_mode == COLOR_MODE_BW) {
c_debugger_go(); ASSERT_SHA("647F3A377513486121C7609E3F53E97DC6FC456D");
} else {
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT_SHA("919EBCBABEA57E932F84E9864B2C35F57F8909B4");
ASSERT_SHA("3BDFD6B009C090789D968AA7F928579EA31CBE3D"); }
PASS(); PASS();
} }
@ -521,6 +619,18 @@ GREATEST_SUITE(test_suite_display) {
test_thread_running = true; test_thread_running = true;
typedef struct parms_t {
color_mode_t mode;
bool doReboot;
} parms_t;
static parms_t parmsArray[] = {
{ COLOR_MODE_COLOR, true },
{ COLOR_MODE_COLOR, false },
{ COLOR_MODE_BW, true },
{ COLOR_MODE_BW, false },
};
unsigned int count = sizeof(parmsArray)/sizeof(parmsArray[0]);
GREATEST_SET_SETUP_CB(testdisplay_setup, NULL); GREATEST_SET_SETUP_CB(testdisplay_setup, NULL);
GREATEST_SET_TEARDOWN_CB(testdisplay_teardown, NULL); GREATEST_SET_TEARDOWN_CB(testdisplay_teardown, NULL);
GREATEST_SET_BREAKPOINT_CB(test_breakpoint, NULL); GREATEST_SET_BREAKPOINT_CB(test_breakpoint, NULL);
@ -539,11 +649,6 @@ GREATEST_SUITE(test_suite_display) {
RUN_TESTp(test_40col_normal); RUN_TESTp(test_40col_normal);
test_do_reboot = true; test_do_reboot = true;
RUN_TESTp(test_40col_normal);
test_do_reboot = false;
RUN_TESTp(test_40col_normal);
test_do_reboot = true;
RUN_TESTp(test_80col_normal); RUN_TESTp(test_80col_normal);
test_do_reboot = false; test_do_reboot = false;
RUN_TESTp(test_80col_normal); RUN_TESTp(test_80col_normal);
@ -561,76 +666,104 @@ GREATEST_SUITE(test_suite_display) {
// lores // lores
RUN_TEST(test_lores_with_80col); for (unsigned int i=0; i<count; i++) {
test_do_reboot = false; test_do_reboot = parmsArray[i].doReboot;
RUN_TEST(test_lores_with_80col); test_color_mode = parmsArray[i].mode;
test_do_reboot = true; RUN_TEST(test_lores_with_80col);
}
RUN_TEST(test_lores_with_40col); for (unsigned int i=0; i<count; i++) {
test_do_reboot = false; test_do_reboot = parmsArray[i].doReboot;
RUN_TEST(test_lores_with_40col); test_color_mode = parmsArray[i].mode;
test_do_reboot = true; RUN_TEST(test_lores_with_40col);
}
RUN_TEST(test_lores_40colmix_normal); for (unsigned int i=0; i<count; i++) {
test_do_reboot = false; test_do_reboot = parmsArray[i].doReboot;
RUN_TEST(test_lores_40colmix_normal); test_color_mode = parmsArray[i].mode;
test_do_reboot = true; RUN_TEST(test_lores_with_40col_2);
}
RUN_TEST(test_lores_40colmix_inverse); for (unsigned int i=0; i<count; i++) {
test_do_reboot = false; test_do_reboot = parmsArray[i].doReboot;
RUN_TEST(test_lores_40colmix_inverse); test_color_mode = parmsArray[i].mode;
test_do_reboot = true; RUN_TEST(test_lores_40colmix_normal);
}
RUN_TEST(test_lores_80colmix_normal); for (unsigned int i=0; i<count; i++) {
test_do_reboot = false; test_do_reboot = parmsArray[i].doReboot;
RUN_TEST(test_lores_80colmix_normal); test_color_mode = parmsArray[i].mode;
test_do_reboot = true; RUN_TEST(test_lores_40colmix_inverse);
}
RUN_TEST(test_lores_80colmix_inverse); for (unsigned int i=0; i<count; i++) {
test_do_reboot = false; test_do_reboot = parmsArray[i].doReboot;
RUN_TEST(test_lores_80colmix_inverse); test_color_mode = parmsArray[i].mode;
test_do_reboot = true; RUN_TEST(test_lores_80colmix_normal);
}
for (unsigned int i=0; i<count; i++) {
test_do_reboot = parmsArray[i].doReboot;
test_color_mode = parmsArray[i].mode;
RUN_TEST(test_lores_80colmix_inverse);
}
// hires // hires
RUN_TESTp(test_hires_with_80col); for (unsigned int i=0; i<count; i++) {
test_do_reboot = false; test_do_reboot = parmsArray[i].doReboot;
RUN_TESTp(test_hires_with_80col); test_color_mode = parmsArray[i].mode;
test_do_reboot = true; RUN_TEST(test_hires_with_80col);
}
RUN_TEST(test_hires_with_40col); for (unsigned int i=0; i<count; i++) {
test_do_reboot = false; test_do_reboot = parmsArray[i].doReboot;
RUN_TEST(test_hires_with_40col); test_color_mode = parmsArray[i].mode;
test_do_reboot = true; RUN_TEST(test_hires_with_40col);
}
RUN_TEST(test_hires_with_40col_page2); for (unsigned int i=0; i<count; i++) {
test_do_reboot = false; test_do_reboot = parmsArray[i].doReboot;
RUN_TEST(test_hires_with_40col_page2); test_color_mode = parmsArray[i].mode;
test_do_reboot = true; RUN_TEST(test_hires_with_40col_page2);
}
RUN_TEST(test_hires_40colmix_normal); for (unsigned int i=0; i<count; i++) {
test_do_reboot = false; test_do_reboot = parmsArray[i].doReboot;
RUN_TEST(test_hires_40colmix_normal); test_color_mode = parmsArray[i].mode;
test_do_reboot = true; RUN_TEST(test_hires_40colmix_normal);
}
RUN_TEST(test_hires_40colmix_inverse); for (unsigned int i=0; i<count; i++) {
test_do_reboot = false; test_do_reboot = parmsArray[i].doReboot;
RUN_TEST(test_hires_40colmix_inverse); test_color_mode = parmsArray[i].mode;
test_do_reboot = true; RUN_TEST(test_hires_40colmix_inverse);
}
RUN_TESTp(test_hires_80colmix_normal); for (unsigned int i=0; i<count; i++) {
test_do_reboot = false; test_do_reboot = parmsArray[i].doReboot;
RUN_TESTp(test_hires_80colmix_normal); test_color_mode = parmsArray[i].mode;
test_do_reboot = true; RUN_TEST(test_hires_80colmix_normal);
}
RUN_TESTp(test_hires_80colmix_inverse); for (unsigned int i=0; i<count; i++) {
test_do_reboot = false; test_do_reboot = parmsArray[i].doReboot;
RUN_TESTp(test_hires_80colmix_inverse); test_color_mode = parmsArray[i].mode;
test_do_reboot = true; RUN_TEST(test_hires_80colmix_inverse);
}
// double-lo/hi // double-lo/hi
RUN_TEST(test_80col_lores); RUN_TEST(test_80col_lores);
test_color_mode = COLOR_MODE_BW;
RUN_TEST(test_80col_lores);
RUN_TEST(test_80col_lores_2);
test_color_mode = COLOR_MODE_BW;
RUN_TEST(test_80col_lores_2);
RUN_TEST(test_80col_hires);
test_color_mode = COLOR_MODE_BW;
RUN_TEST(test_80col_hires); RUN_TEST(test_80col_hires);
// ... // ...
@ -661,8 +794,6 @@ void test_display(int _argc, char **_argv) {
test_argc = _argc; test_argc = _argc;
test_argv = _argv; test_argv = _argv;
srandom(time(NULL));
test_common_init(); test_common_init();
pthread_t p; pthread_t p;