Menu
▾
▴
[fuse-emulator-cvs] [libspectrum] branch master updated: fix: Fixed running unittest checks which require gzip, but gzip was not enabled or available.
|
From: <sba...@us...> - 2023-08-21 17:26:24
|
This is an automated email from the git hooks/post-receive-user script. sbaldovi pushed a commit to branch master in repository libspectrum. View the commit online: https://sourceforge.net/p/fuse-emulator/libspectrum/ci/56e6f89c696c4d03d93bfbb519e47a7a5136a876/ The following commit(s) were added to refs/heads/master by this push: new 56e6f89 fix: Fixed running unittest checks which require gzip, but gzip was not enabled or available. new 8b374cb Merge request #13: Fixed unittest checks that require gzip 56e6f89 is described below commit 56e6f89c696c4d03d93bfbb519e47a7a5136a876 Author: Miroslav Ďurčík <743...@us...> AuthorDate: Tue Apr 25 22:12:25 2023 +0200 fix: Fixed running unittest checks which require gzip, but gzip was not enabled or available. fix: Fixed running unittest checks which require gzip, but gzip was not enabled or available. In case of writing block, uncompressed size will be checked. In case of reading gzipped files, such tests will be skipped. fix: Fixed core dump in test 39, when 85 (0x55) pages where to be saved, while memory was reserverd for 64. refactor: Internal function for executing such test was modified to return error code in case more pages requested than actually reserved in memory. unittest: Added support for returning TEST_SKIPPED as return value from test function. See also https://sourceforge.net/p/arki55-fuse-mod/tickets/10/ --- libspectrum.c | 4 +-- libspectrum.h.in | 1 + szx.c | 19 ++++++++-- test/szx.c | 106 +++++++++++++++++++++++++++++++++++++++++++------------ test/test.c | 50 +++++++++++++++++++++----- test/test.h | 1 + 6 files changed, 144 insertions(+), 37 deletions(-) diff --git a/libspectrum.c b/libspectrum.c index 55ba4aa..58fa740 100644 --- a/libspectrum.c +++ b/libspectrum.c @@ -840,10 +840,10 @@ libspectrum_uncompress_file( unsigned char **new_buffer, size_t *new_length, #else /* #ifdef HAVE_ZLIB_H */ - libspectrum_print_error( LIBSPECTRUM_ERROR_UNKNOWN, + libspectrum_print_error( LIBSPECTRUM_ERROR_MISSING_ZLIB, "zlib not available to decompress gzipped file" ); if( new_filename ) libspectrum_free( *new_filename ); - return LIBSPECTRUM_ERROR_UNKNOWN; + return LIBSPECTRUM_ERROR_MISSING_ZLIB; #endif /* #ifdef HAVE_ZLIB_H */ diff --git a/libspectrum.h.in b/libspectrum.h.in index 8c11f44..22920ae 100644 --- a/libspectrum.h.in +++ b/libspectrum.h.in @@ -99,6 +99,7 @@ typedef enum libspectrum_error { LIBSPECTRUM_ERROR_SIGNATURE, LIBSPECTRUM_ERROR_SLT, /* .slt data found at end of a .z80 file */ LIBSPECTRUM_ERROR_INVALID, /* Invalid parameter supplied */ + LIBSPECTRUM_ERROR_MISSING_ZLIB, /* Missing or not used zlib.h */ LIBSPECTRUM_ERROR_LOGIC = -1, diff --git a/szx.c b/szx.c index 5889de8..1f9df19 100644 --- a/szx.c +++ b/szx.c @@ -311,7 +311,7 @@ write_atrp_chunk( libspectrum_buffer *buffer, libspectrum_buffer *block_data, static void write_zxcf_chunk( libspectrum_buffer *buffer, libspectrum_buffer *data, libspectrum_snap *snap ); -static void +static libspectrum_error write_cfrp_chunk( libspectrum_buffer *buffer, libspectrum_buffer *block_data, libspectrum_snap *snap, int page, int compress ); static void @@ -2800,7 +2800,11 @@ libspectrum_szx_write( libspectrum_buffer *buffer, int *out_flags, write_zxcf_chunk( buffer, block_data, snap ); for( i = 0; i < libspectrum_snap_zxcf_pages( snap ); i++ ) { - write_cfrp_chunk( buffer, block_data, snap, i, compress ); + error = write_cfrp_chunk( buffer, block_data, snap, i, compress ); + if( error != LIBSPECTRUM_ERROR_NONE ) { + libspectrum_buffer_free( block_data ); + return error; + } } } @@ -3781,14 +3785,23 @@ write_zxcf_chunk( libspectrum_buffer *buffer, libspectrum_buffer *data, write_chunk( buffer, ZXSTBID_ZXCF, data ); } -static void +static libspectrum_error write_cfrp_chunk( libspectrum_buffer *buffer, libspectrum_buffer *block_data, libspectrum_snap *snap, int page, int compress ) { + if( page >= SNAPSHOT_ZXCF_PAGES ) { + libspectrum_print_error( LIBSPECTRUM_ERROR_INVALID, + "%s:write_cfrp_chunk: page number %lu too high", + __FILE__, (unsigned long)page ); + return LIBSPECTRUM_ERROR_INVALID; + } + const libspectrum_byte *data = libspectrum_snap_zxcf_ram( snap, page ); write_ram_page( buffer, block_data, ZXSTBID_ZXCFRAMPAGE, data, 0x4000, page, compress, 0x00 ); + + return LIBSPECTRUM_ERROR_NONE; } #ifdef HAVE_ZLIB_H diff --git a/test/szx.c b/test/szx.c index 83972ef..2c295bc 100644 --- a/test/szx.c +++ b/test/szx.c @@ -104,6 +104,7 @@ szx_write_block_test_with_flags( const char *id, libspectrum_machine machine, { libspectrum_snap *snap; libspectrum_byte *buffer; size_t length; + libspectrum_error error; int out_flags; szx_chunk_t *chunk; size_t i; @@ -117,8 +118,14 @@ szx_write_block_test_with_flags( const char *id, libspectrum_machine machine, length = 0; buffer = NULL; - libspectrum_snap_write( &buffer, &length, &out_flags, snap, + error = libspectrum_snap_write( &buffer, &length, &out_flags, snap, LIBSPECTRUM_ID_SNAPSHOT_SZX, NULL, flags ); + if (error != LIBSPECTRUM_ERROR_NONE) { + fprintf( stderr, "Snap write failed with error %d\n", error ); + if (buffer) + libspectrum_free( buffer ); + return TEST_INCOMPLETE; + } libspectrum_snap_free( snap ); chunk = find_szx_chunk( buffer, length, id ); @@ -144,7 +151,8 @@ szx_write_block_test_with_flags( const char *id, libspectrum_machine machine, } } } else { - fprintf( stderr, "Chunk has wrong length\n" ); + fprintf( stderr, "Chunk has wrong length (expected %lu, got %lu)\n", + (unsigned long)total_length, (unsigned long)chunk->length ); r = TEST_FAIL; } @@ -157,10 +165,10 @@ szx_write_block_test_with_flags( const char *id, libspectrum_machine machine, static test_return_t szx_write_block_test( const char *id, libspectrum_machine machine, void (*setter)( libspectrum_snap* ), - libspectrum_byte *expected, size_t expected_length ) + libspectrum_byte *expected, size_t expected_length, size_t total_length ) { return szx_write_block_test_with_flags( id, machine, 0, setter, - expected, expected_length, expected_length ); + expected, expected_length, total_length ); } static test_return_t @@ -223,7 +231,7 @@ test_return_t test_31( void ) { return szx_write_block_test( "Z80R", LIBSPECTRUM_MACHINE_48, z80r_setter, - test_31_expected, ARRAY_SIZE(test_31_expected) ); + test_31_expected, ARRAY_SIZE(test_31_expected), ARRAY_SIZE(test_31_expected) ); } static void @@ -244,7 +252,7 @@ test_return_t test_32( void ) { return szx_write_block_test( "SPCR", LIBSPECTRUM_MACHINE_PLUS3, spcr_setter, - test_32_expected, ARRAY_SIZE(test_32_expected) ); + test_32_expected, ARRAY_SIZE(test_32_expected), ARRAY_SIZE(test_32_expected) ); } static void @@ -269,7 +277,7 @@ test_return_t test_33( void ) { return szx_write_block_test( "JOY\0", LIBSPECTRUM_MACHINE_48, joy_setter, - test_33_expected, ARRAY_SIZE(test_33_expected) ); + test_33_expected, ARRAY_SIZE(test_33_expected), ARRAY_SIZE(test_33_expected) ); } static void @@ -292,7 +300,7 @@ test_return_t test_34( void ) { return szx_write_block_test( "KEYB", LIBSPECTRUM_MACHINE_48, keyb_setter, - test_34_expected, ARRAY_SIZE(test_34_expected) ); + test_34_expected, ARRAY_SIZE(test_34_expected), ARRAY_SIZE(test_34_expected) ); } static void @@ -310,7 +318,7 @@ test_return_t test_35( void ) { return szx_write_block_test( "ZXPR", LIBSPECTRUM_MACHINE_48, zxpr_setter, - test_35_expected, ARRAY_SIZE(test_35_expected) ); + test_35_expected, ARRAY_SIZE(test_35_expected), ARRAY_SIZE(test_35_expected) ); } static libspectrum_byte @@ -345,7 +353,7 @@ test_return_t test_36( void ) { return szx_write_block_test( "AY\0\0", LIBSPECTRUM_MACHINE_48, ay_setter, - test_36_expected, ARRAY_SIZE(test_36_expected) ); + test_36_expected, ARRAY_SIZE(test_36_expected), ARRAY_SIZE(test_36_expected) ); } static void @@ -364,7 +372,7 @@ test_return_t test_37( void ) { return szx_write_block_test( "SCLD", LIBSPECTRUM_MACHINE_TC2048, scld_setter, - test_37_expected, ARRAY_SIZE(test_37_expected) ); + test_37_expected, ARRAY_SIZE(test_37_expected), ARRAY_SIZE(test_37_expected) ); } static void @@ -393,7 +401,7 @@ test_return_t test_38( void ) { return szx_write_block_test( "ZXAT", LIBSPECTRUM_MACHINE_48, zxat_setter, - test_38_expected, ARRAY_SIZE(test_38_expected) ); + test_38_expected, ARRAY_SIZE(test_38_expected), ARRAY_SIZE(test_38_expected) ); } static void @@ -403,21 +411,21 @@ zxcf_setter( libspectrum_snap *snap ) libspectrum_snap_set_zxcf_upload( snap, 1 ); libspectrum_snap_set_zxcf_memctl( snap, 0x37 ); - libspectrum_snap_set_zxcf_pages( snap, 0x55 ); + libspectrum_snap_set_zxcf_pages( snap, 0x35 ); } static libspectrum_byte test_39_expected[] = { 0x01, 0x00, /* Flags */ 0x37, /* Memory control */ - 0x55 /* Page count */ + 0x35 /* Page count */ }; test_return_t test_39( void ) { return szx_write_block_test( "ZXCF", LIBSPECTRUM_MACHINE_48, zxcf_setter, - test_39_expected, ARRAY_SIZE(test_39_expected) ); + test_39_expected, ARRAY_SIZE(test_39_expected), ARRAY_SIZE(test_39_expected) ); } static void @@ -437,7 +445,7 @@ test_return_t test_40( void ) { return szx_write_block_test( "AMXM", LIBSPECTRUM_MACHINE_48, amxm_setter, - test_40_expected, ARRAY_SIZE(test_40_expected) ); + test_40_expected, ARRAY_SIZE(test_40_expected), ARRAY_SIZE(test_40_expected) ); } static void @@ -453,7 +461,7 @@ test_return_t test_41( void ) { return szx_write_block_test( "SIDE", LIBSPECTRUM_MACHINE_48, side_setter, - empty_chunk_expected, ARRAY_SIZE(empty_chunk_expected) ); + empty_chunk_expected, ARRAY_SIZE(empty_chunk_expected), ARRAY_SIZE(empty_chunk_expected) ); } static void @@ -472,7 +480,7 @@ test_return_t test_42( void ) { return szx_write_block_test( "DRUM", LIBSPECTRUM_MACHINE_48, drum_setter, - test_42_expected, ARRAY_SIZE(test_42_expected) ); + test_42_expected, ARRAY_SIZE(test_42_expected), ARRAY_SIZE(test_42_expected) ); } static void @@ -492,7 +500,7 @@ test_return_t test_43( void ) { return szx_write_block_test( "COVX", LIBSPECTRUM_MACHINE_48, covx_setter, - test_43_expected, ARRAY_SIZE(test_43_expected) ); + test_43_expected, ARRAY_SIZE(test_43_expected), ARRAY_SIZE(test_43_expected) ); } static void @@ -505,7 +513,7 @@ test_return_t test_57( void ) { return szx_write_block_test( "ZMMC", LIBSPECTRUM_MACHINE_48, zmmc_setter, - empty_chunk_expected, ARRAY_SIZE(empty_chunk_expected) ); + empty_chunk_expected, ARRAY_SIZE(empty_chunk_expected), ARRAY_SIZE(empty_chunk_expected) ); } static void @@ -515,6 +523,7 @@ ramp_setter( libspectrum_snap *snap ) libspectrum_snap_set_pages( snap, 0, ram ); } +#ifdef HAVE_ZLIB_H static libspectrum_byte empty_ram_page_expected[] = { 0x01, 0x00, /* Flags */ @@ -526,12 +535,29 @@ empty_ram_page_expected[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xb7, 0x01, 0x40, 0x00, 0x00, 0x01 }; +#else +static libspectrum_byte +empty_ram_page_uncompressed_expected[] = { + 0x00, 0x00, /* Flags */ + 0x00, /* Page number */ + /* 16 Kb of zeros uncompressed */ +}; +#endif test_return_t test_59( void ) { return szx_write_block_test( "RAMP", LIBSPECTRUM_MACHINE_48, ramp_setter, - empty_ram_page_expected, ARRAY_SIZE(empty_ram_page_expected) ); + #ifdef HAVE_ZLIB_H + /* gzip enabled in build, so block written compressed */ + empty_ram_page_expected, ARRAY_SIZE(empty_ram_page_expected), + ARRAY_SIZE(empty_ram_page_expected) + #else + /* gzip not enabled in build, so block written uncompressed */ + empty_ram_page_uncompressed_expected, ARRAY_SIZE(empty_ram_page_uncompressed_expected), + ARRAY_SIZE(empty_ram_page_uncompressed_expected) + 0x4000 + #endif + ); } static void @@ -550,7 +576,16 @@ test_return_t test_61( void ) { return szx_write_block_test( "ATRP", LIBSPECTRUM_MACHINE_48, atrp_setter, - empty_ram_page_expected, ARRAY_SIZE(empty_ram_page_expected) ); + #ifdef HAVE_ZLIB_H + /* gzip enabled in build, so block written compressed */ + empty_ram_page_expected, ARRAY_SIZE(empty_ram_page_expected), + ARRAY_SIZE(empty_ram_page_expected) + #else + /* gzip not enabled in build, so block written uncompressed */ + empty_ram_page_uncompressed_expected, ARRAY_SIZE(empty_ram_page_uncompressed_expected), + ARRAY_SIZE(empty_ram_page_uncompressed_expected) + 0x4000 + #endif + ); } static void @@ -569,7 +604,16 @@ test_return_t test_62( void ) { return szx_write_block_test( "CFRP", LIBSPECTRUM_MACHINE_48, cfrp_setter, - empty_ram_page_expected, ARRAY_SIZE(empty_ram_page_expected) ); + #ifdef HAVE_ZLIB_H + /* gzip enabled in build, so block written compressed */ + empty_ram_page_expected, ARRAY_SIZE(empty_ram_page_expected), + ARRAY_SIZE(empty_ram_page_expected) + #else + /* gzip not enabled in build, so block written uncompressed */ + empty_ram_page_uncompressed_expected, ARRAY_SIZE(empty_ram_page_uncompressed_expected), + ARRAY_SIZE(empty_ram_page_uncompressed_expected) + 0x4000 + #endif + ); } static libspectrum_byte @@ -647,6 +691,10 @@ static test_return_t szx_read_block_from_compressed_snap_test( const char *id, int (*check_fn)( libspectrum_snap* ) ) { + #ifndef HAVE_ZLIB_H + return TEST_SKIPPED; /* gzip not enabled in build */ + #endif + return szx_read_block_test_with_template( id, STATIC_TEST_PATH( "szx-chunks/%s-uncompressed.szx.gz" ), check_fn ); } @@ -951,6 +999,10 @@ ramp_check( libspectrum_snap *snap ) test_return_t test_60( void ) { + #ifndef HAVE_ZLIB_H + return TEST_SKIPPED; /* gzip not enabled in build */ + #endif + return szx_read_block_test( "RAMP", ramp_check ); } @@ -963,6 +1015,10 @@ atrp_check( libspectrum_snap *snap ) test_return_t test_63( void ) { + #ifndef HAVE_ZLIB_H + return TEST_SKIPPED; /* gzip not enabled in build */ + #endif + return szx_read_block_test( "ATRP", atrp_check ); } @@ -975,6 +1031,10 @@ cfrp_check( libspectrum_snap *snap ) test_return_t test_64( void ) { + #ifndef HAVE_ZLIB_H + return TEST_SKIPPED; /* gzip not enabled in build */ + #endif + return szx_read_block_test( "CFRP", cfrp_check ); } diff --git a/test/test.c b/test/test.c index 363e30c..c1a45d3 100644 --- a/test/test.c +++ b/test/test.c @@ -256,6 +256,10 @@ test_3( void ) static test_return_t test_4( void ) { + #ifndef HAVE_ZLIB_H + return TEST_SKIPPED; /* gzip not enabled in build */ + #endif + const char *filename = STATIC_TEST_PATH( "invalid.gz" ); return read_snap( filename, filename, LIBSPECTRUM_ERROR_UNKNOWN ); } @@ -264,6 +268,10 @@ test_4( void ) static test_return_t test_5( void ) { + #ifndef HAVE_ZLIB_H + return TEST_SKIPPED; /* gzip not enabled in build */ + #endif + return read_snap( STATIC_TEST_PATH( "invalid.gz" ), NULL, LIBSPECTRUM_ERROR_UNKNOWN ); } @@ -413,6 +421,10 @@ test_19( void ) static test_return_t test_20( void ) { + #ifndef HAVE_ZLIB_H + return TEST_SKIPPED; /* gzip not enabled in build */ + #endif + const char *filename = STATIC_TEST_PATH( "sp-2000.sna.gz" ); return read_snap( filename, filename, LIBSPECTRUM_ERROR_CORRUPT ); } @@ -420,6 +432,10 @@ test_20( void ) static test_return_t test_21( void ) { + #ifndef HAVE_ZLIB_H + return TEST_SKIPPED; /* gzip not enabled in build */ + #endif + const char *filename = STATIC_TEST_PATH( "sp-ffff.sna.gz" ); return read_snap( filename, filename, LIBSPECTRUM_ERROR_CORRUPT ); } @@ -690,6 +706,10 @@ test_26( void ) static test_return_t test_27( void ) { + #ifndef HAVE_ZLIB_H + return TEST_SKIPPED; /* gzip not enabled in build */ + #endif + const char *filename = STATIC_TEST_PATH( "empty.szx" ); libspectrum_byte *buffer = NULL; size_t filesize = 0; @@ -764,6 +784,10 @@ test_30( void ) static test_return_t test_71( void ) { +#ifndef HAVE_ZLIB_H + return TEST_SKIPPED; /* gzip not enabled in build */ +#endif + const char *filename = STATIC_TEST_PATH( "random.szx" ); libspectrum_byte *buffer = NULL; size_t filesize = 0; @@ -1037,17 +1061,25 @@ main( int argc, char *argv[] ) tests_done++; switch( test->test() ) { case TEST_PASS: - printf( "passed\n" ); - pass++; - break; + /* Test executed completely and passed */ + printf( "passed\n" ); + pass++; + break; case TEST_FAIL: - printf( "FAILED\n" ); - fail++; - break; + /* Test executed completely but failed */ + printf( "FAILED\n" ); + fail++; + break; case TEST_INCOMPLETE: - printf( "NOT COMPLETE\n" ); - incomplete++; - break; + /* Error occurred while executing test */ + printf( "NOT COMPLETE\n" ); + incomplete++; + break; + case TEST_SKIPPED: + /* Not possible to run this test (missing dependencies) */ + printf( "skipped\n" ); + tests_skipped++; + break; } } else { tests_skipped++; diff --git a/test/test.h b/test/test.h index 04bd898..115e12f 100644 --- a/test/test.h +++ b/test/test.h @@ -9,6 +9,7 @@ typedef enum test_return_t { TEST_PASS, TEST_FAIL, TEST_INCOMPLETE, + TEST_SKIPPED, } test_return_t; typedef struct test_edge_sequence_t { |
