Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-02-03 08:32:40 +00:00
Code Issues Projects Releases Wiki Activity

Tests build/run on Mac

Browse Source 
- Fixes statistics printing
    - Some VM tests currently fail on Mac
This commit is contained in:
Aaron Culliney 2014-11-27 10:52:12 -08:00
parent 2aa2648d30
commit 6c1215dbb2
4 changed files with 53 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Apple2Mac/Apple2Mac.xcodeproj/project.pbxproj
View File

@ -180,6 +180,8 @@
77E1C0C419D7298F004344E0 /* EmulatorWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 77E1C0BE19D7298F004344E0 /* EmulatorWindowController.m */; };
77E1C0C519D7298F004344E0 /* EmulatorGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 77E1C0C019D7298F004344E0 /* EmulatorGLView.m */; };
77E1C0C619D7298F004344E0 /* EmulatorFullscreenWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 77E1C0C219D7298F004344E0 /* EmulatorFullscreenWindow.m */; };
77EB316C1A27A9AF00DC5A8A /* blank.dsk.gz in Resources */ = {isa = PBXBuildFile; fileRef = 4ADC523019E8D3F600186B36 /* blank.dsk.gz */; };
77EB316D1A27A9AF00DC5A8A /* blank.nib.gz in Resources */ = {isa = PBXBuildFile; fileRef = 4ADC523119E8D3F600186B36 /* blank.nib.gz */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -826,6 +828,8 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
77EB316C1A27A9AF00DC5A8A /* blank.dsk.gz in Resources */,
77EB316D1A27A9AF00DC5A8A /* blank.nib.gz in Resources */,
4ADC525319E8D3F600186B36 /* testvm1.dsk.gz in Resources */,
4ADC524719E8D3F600186B36 /* README in Resources */,
4ADC521E19E8CA4500186B36 /* MainMenu-Test.xib in Resources */,
@ -1229,6 +1233,8 @@
"HEADLESS=1",
"TESTING=1",
"CPU_TRACING=1",
"DISK_TRACING=1",
"VM_TRACING=1",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
@ -1466,6 +1472,8 @@
"HEADLESS=1",
"TESTING=1",
"CPU_TRACING=1",
"DISK_TRACING=1",
"VM_TRACING=1",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",

34
src/test/testdisplay.c
View File

@ -331,7 +331,9 @@ TEST test_80col_hires() {
static int begin_video = -1;
static void *test_thread(void *dummyptr) {
GREATEST_SUITE(test_suite_display) {
GREATEST_SET_SETUP_CB(testdisplay_setup, NULL);
GREATEST_SET_TEARDOWN_CB(testdisplay_teardown, NULL);
// TESTS --------------------------
begin_video=!is_headless;
@ -441,14 +443,30 @@ static void *test_thread(void *dummyptr) {
// ...
c_eject_6(0);
pthread_mutex_unlock(&interface_mutex);
}
SUITE(test_suite_display);
GREATEST_MAIN_DEFS();
static char **test_argv = NULL;
static int test_argc = 0;
static int _test_display(void) {
int argc = test_argc;
char **argv = test_argv;
GREATEST_MAIN_BEGIN();
RUN_SUITE(test_suite_display);
GREATEST_MAIN_END();
}
GREATEST_SUITE(test_suite_display) {
static void *test_thread(void *dummyptr) {
_test_display();
return NULL;
}
GREATEST_SET_SETUP_CB(testdisplay_setup, NULL);
GREATEST_SET_TEARDOWN_CB(testdisplay_teardown, NULL);
void test_display(int argc, char **argv) {
test_argc = argc;
test_argv = argv;
srandom(time(NULL));
@ -469,14 +487,6 @@ GREATEST_SUITE(test_suite_display) {
pthread_join(p, NULL);
}
SUITE(test_suite_display);
GREATEST_MAIN_DEFS();
int test_display(int argc, char **argv) {
GREATEST_MAIN_BEGIN();
RUN_SUITE(test_suite_display);
}
#if !defined(__APPLE__)
int main(int argc, char **argv) {
test_display(argc, argv);

34
src/test/testvm.c
View File

@ -3450,7 +3450,9 @@ TEST test_check_cxrom(bool flag_cxrom) {
static int begin_video = -1;
static void *test_thread(void *dummyptr) {
GREATEST_SUITE(test_suite_vm) {
GREATEST_SET_SETUP_CB(testvm_setup, NULL);
GREATEST_SET_TEARDOWN_CB(testvm_teardown, NULL);
// TESTS --------------------------
begin_video=!is_headless;
@ -3636,14 +3638,30 @@ static void *test_thread(void *dummyptr) {
// ...
c_eject_6(0);
pthread_mutex_unlock(&interface_mutex);
}
SUITE(test_suite_vm);
GREATEST_MAIN_DEFS();
static char **test_argv = NULL;
static int test_argc = 0;
static int _test_vm(void) {
int argc = test_argc;
char **argv = test_argv;
GREATEST_MAIN_BEGIN();
RUN_SUITE(test_suite_vm);
GREATEST_MAIN_END();
}
GREATEST_SUITE(test_suite_vm) {
static void *test_thread(void *dummyptr) {
_test_vm();
return NULL;
}
GREATEST_SET_SETUP_CB(testvm_setup, NULL);
GREATEST_SET_TEARDOWN_CB(testvm_teardown, NULL);
void test_vm(int argc, char **argv) {
test_argc = argc;
test_argv = argv;
c_read_random(0x0);
srandom(0); // force a known sequence
@ -3665,14 +3683,6 @@ GREATEST_SUITE(test_suite_vm) {
pthread_join(p, NULL);
}
SUITE(test_suite_vm);
GREATEST_MAIN_DEFS();
int test_vm(int argc, char **argv) {
GREATEST_MAIN_BEGIN();
RUN_SUITE(test_suite_vm);
}
#if !defined(__APPLE__)
int main(int argc, char **argv) {
test_vm(argc, argv);

1
src/vm.c
View File

@ -1082,6 +1082,7 @@ bool vm_trace_is_ignored(uint16_t ea) {
if ((ea < 0xC000) || (ea > 0xCFFF)) {
return true;
}
return false;
}
#endif