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

Get testtrace building again on Desktop Linux

Browse Source 
- These tests are currently somewhat unstable, TODO FIXME
This commit is contained in:
Aaron Culliney 2016-04-26 20:57:35 -07:00
parent 30b203e3da
commit da4e5eb75a
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/misc.c
View File

@ -325,9 +325,12 @@ int main(int _argc, char **_argv) {
# elif TEST_DISK # elif TEST_DISK
extern int test_disk(int, char *[]); extern int test_disk(int, char *[]);
test_disk(argc, argv); test_disk(argc, argv);
#elif TEST_PREFS # elif TEST_PREFS
extern void test_prefs(int, char *[]); extern void test_prefs(int, char *[]);
test_prefs(argc, argv); test_prefs(argc, argv);
# elif TEST_TRACE
extern void test_trace(int, char *[]);
test_trace(argc, argv);
# else # else
# error "OOPS, no testsuite specified" # error "OOPS, no testsuite specified"
# endif # endif

28
src/test/testtrace.c
View File

@ -385,6 +385,8 @@ TEST test_boot_disk_vmtrace_po() {
// Test Suite // Test Suite
GREATEST_SUITE(test_suite_trace) { GREATEST_SUITE(test_suite_trace) {
test_thread_running = true;
pthread_mutex_lock(&interface_mutex); pthread_mutex_lock(&interface_mutex);
GREATEST_SET_SETUP_CB(testtrace_setup, NULL); GREATEST_SET_SETUP_CB(testtrace_setup, NULL);
@ -392,7 +394,6 @@ GREATEST_SUITE(test_suite_trace) {
GREATEST_SET_BREAKPOINT_CB(test_breakpoint, NULL); GREATEST_SET_BREAKPOINT_CB(test_breakpoint, NULL);
// TESTS -------------------------- // TESTS --------------------------
test_thread_running = true;
#if ABUSIVE_TESTS #if ABUSIVE_TESTS
RUN_TESTp(test_boot_disk_cputrace); RUN_TESTp(test_boot_disk_cputrace);
@ -418,20 +419,22 @@ GREATEST_MAIN_DEFS();
static char **test_argv = NULL; static char **test_argv = NULL;
static int test_argc = 0; static int test_argc = 0;
static void *test_thread(void *dummyptr) { static void *_test_thread(void) {
int argc = test_argc; int argc = test_argc;
char **argv = test_argv; char **argv = test_argv;
GREATEST_MAIN_BEGIN(); GREATEST_MAIN_BEGIN();
RUN_SUITE(test_suite_trace); RUN_SUITE(test_suite_trace);
GREATEST_MAIN_END(); GREATEST_MAIN_END();
}
static void *test_thread(void *dummyptr) {
_test_thread();
return NULL; return NULL;
} }
void test_trace(int argc, char **argv) { void test_trace(int _argc, char **_argv) {
test_argc = argc; test_argc = _argc;
test_argv = argv; test_argv = _argv;
emulator_start();
test_common_init(); test_common_init();
@ -442,16 +445,5 @@ void test_trace(int argc, char **argv) {
nanosleep(&ts, NULL); nanosleep(&ts, NULL);
} }
pthread_detach(p); pthread_detach(p);
video_main_loop();
#if !defined(__APPLE__) && !defined(ANDROID)
emulator_shutdown();
#endif
} }
#if !defined(__APPLE__) && !defined(ANDROID)
int main(int argc, char **argv) {
test_trace(argc, argv);
}
#endif