Tests appear to be working on Droid

This commit is contained in:
Aaron Culliney 2018-11-20 11:30:18 -08:00
parent 8a347630b3
commit 6a519b7b5f
3 changed files with 6 additions and 12 deletions

View File

@ -50,7 +50,6 @@
typedef struct diskette_t {
char *file_name;
int fd;
int fd2;
uint8_t *raw_image_data;
unsigned int whole_len;
uint8_t *nib_image_data;

View File

@ -46,7 +46,7 @@ void test_common_init(void) {
char *envvar = NULL;
ASPRINTF(&envvar, "APPLE2IX_JSON=%s/.apple2.test.json", HOMEDIR);
assert(envvar);
assert((uintptr_t)envvar);
putenv(envvar);
LEAK(envvar);
@ -178,7 +178,7 @@ char **_copy_paths_main(const char *fileName) {
};
char **paths = CALLOC(1, sizeof(fmts));
assert(paths);
assert((uintptr_t)paths);
do {
const char *fmt = NULL;

View File

@ -43,9 +43,8 @@ static void testdisk_teardown(void *arg) {
# define EXPECTED_DISK_TRACE_FILE_SIZE 141348
# define EXPECTED_DISK_TRACE_SHA "8E2415BB7F0A113BFE048FFE0C076AD4B377D22E"
#else
# error FIXME TODO ...
#define EXPECTED_DISK_TRACE_FILE_SIZE 134290
#define EXPECTED_DISK_TRACE_SHA "FA47CC59F0CC7E5B1E938FD54A3BD8DB6C930593"
# define EXPECTED_DISK_TRACE_FILE_SIZE 134290
# define EXPECTED_DISK_TRACE_SHA "FA47CC59F0CC7E5B1E938FD54A3BD8DB6C930593"
#endif
TEST test_boot_disk_bytes() {
@ -142,9 +141,8 @@ TEST test_boot_disk_bytes_nib() {
# define EXPECTED_DISK_TRACE_PO_FILE_SIZE 141348
# define EXPECTED_DISK_TRACE_PO_SHA "41C382A0A508F9A7935532ECFB7A1B6D53956A8D"
#else
# error FIXME TODO ...
#define EXPECTED_DISK_TRACE_PO_FILE_SIZE 134290
#define EXPECTED_DISK_TRACE_PO_SHA "E85D7B357B02942772F46332953E59CAB67D85CD"
# define EXPECTED_DISK_TRACE_PO_FILE_SIZE 134290
# define EXPECTED_DISK_TRACE_PO_SHA "E85D7B357B02942772F46332953E59CAB67D85CD"
#endif
TEST test_boot_disk_bytes_po() {
test_setup_boot_disk(BLANK_PO, 0);
@ -326,7 +324,6 @@ TEST test_savehello_po() {
# define EXPECTED_DISKWRITE_TRACE_DSK_FILE_SIZE 85915
# define EXPECTED_DISKWRITE_TRACE_DSK_SHA "05A9043B09605546F2BCFD31CB2E48C779227D95"
#else
# error FIXME TODO ...
# define EXPECTED_DISKWRITE_TRACE_DSK_FILE_SIZE 85916
# define EXPECTED_DISKWRITE_TRACE_DSK_SHA "06E446C69C4C3522BDEF146B56B0414CA945A588"
#endif
@ -626,7 +623,6 @@ TEST test_disk_bytes_savehello_po() {
# define EXPECTED_OOS_DSK_TRACE_FILE_SIZE 4386397
# define EXPECTED_OOS_DSK_TRACE_SHA "FF60D99539047B76B0B441C5907F0FBE3D0B2FCE"
#else
# error FIXME TODO ...
# define EXPECTED_OOS_DSK_TRACE_FILE_SIZE 4386354
# define EXPECTED_OOS_DSK_TRACE_SHA "1304191D985B3D3E528FB462D2CF3677584CD2C3"
#endif
@ -836,7 +832,6 @@ TEST test_outofspace_po() {
# define EXPECTED_BLOAD_TRACE_DSK_FILE_SIZE 1595253
# define EXPECTED_BLOAD_TRACE_DSK_SHA "BF8719EE6E4814556957603068C47CC3F78E352C"
#else
# error FIXME TODO ...
# define EXPECTED_BLOAD_TRACE_DSK_FILE_SIZE 1512000
# define EXPECTED_BLOAD_TRACE_DSK_SHA "F5BE62CEFA89B6B09C0F257D34AD4E0868DA0B4C"
#endif