Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-16 05:29:38 +00:00
Code Issues Projects Releases Wiki Activity

Fix some compiler warnings and tests pass on desktop Linux

Browse Source
This commit is contained in:
Aaron Culliney 2018-11-17 15:52:51 -08:00
parent 0625084602
commit 92369c3fdb
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/testcommon.h
View File

@ -50,7 +50,7 @@ static inline bool _matchFramebufferSHA(const char *SHA_STR, bool do_assert) {
extern void timing_setVideoDirty(void);
timing_setVideoDirty();
fb = display_waitForNextCompleteFramebuffer();
SHA1(fb, SCANWIDTH*SCANHEIGHT*PIXEL_STRIDE, md);
SHA1((const uint8_t *)fb, SCANWIDTH*SCANHEIGHT*PIXEL_STRIDE, md);
sha1_to_str(md, mdstr);
bool matches = strcasecmp(mdstr, SHA_STR) == 0;

4
src/test/testdisk.c
View File

@ -1391,7 +1391,7 @@ static int _test_disk_image_with_gzip_header(int readonly) {
do {
uint8_t md[SHA_DIGEST_LENGTH];
SHA1(display_waitForNextCompleteFramebuffer(), SCANWIDTH*SCANHEIGHT*PIXEL_STRIDE, md);
SHA1((uint8_t *)display_waitForNextCompleteFramebuffer(), SCANWIDTH*SCANHEIGHT*PIXEL_STRIDE, md);
sha1_to_str(md, mdstr);
bool matches_sha1 = (strcasecmp(mdstr, GZBAD_NIB_LOAD_SHA1) == 0);
@ -1496,7 +1496,7 @@ TEST test_reinsert_edgecase() {
c_debugger_go();
uint8_t md[SHA_DIGEST_LENGTH];
SHA1(display_waitForNextCompleteFramebuffer(), SCANWIDTH*SCANHEIGHT*PIXEL_STRIDE, md);
SHA1((uint8_t *)display_waitForNextCompleteFramebuffer(), SCANWIDTH*SCANHEIGHT*PIXEL_STRIDE, md);
sha1_to_str(md, mdstr);
ASSERT(strcmp(mdstr, DROL_CRACK_SCREEN_SHA) != 0);

6
src/test/testprefs.c
View File

@ -14,7 +14,7 @@
static bool test_thread_running = false;
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 ...
static void testprefs_setup(void *unused) {
}
@ -1984,7 +1984,7 @@ TEST test_prefs_load_and_save() {
// Test Suite
GREATEST_SUITE(test_suite_prefs) {
pthread_mutex_lock(&interface_mutex);
//pthread_mutex_lock(&interface_mutex);
test_thread_running = true;
@ -2041,7 +2041,7 @@ GREATEST_SUITE(test_suite_prefs) {
RUN_TESTp(test_prefs_load_and_save);
// --------------------------------
pthread_mutex_unlock(&interface_mutex);
//pthread_mutex_unlock(&interface_mutex);
}
SUITE(test_suite_prefs);