diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2009-10-04 22:57:12 +0300 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2009-10-04 22:57:12 +0300 |
| commit | ebfb2c5e1f344e5c6e549b9dedaa49b0749a4a24 (patch) | |
| tree | 7e2f519ad2be01b8f9c7b230f71d479d550c9ae4 /tests | |
| parent | Add support for --enable-assume-ram=SIZE. (diff) | |
| download | xz-ebfb2c5e1f344e5c6e549b9dedaa49b0749a4a24.tar.xz | |
Use a tuklib module for integer handling.
This replaces bswap.h and integer.h.
The tuklib module uses <byteswap.h> on GNU,
<sys/endian.h> on *BSDs and <sys/byteorder.h>
on Solaris, which may contain optimized code
like inline assembly.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_block_header.c | 4 | ||||
| -rw-r--r-- | tests/test_stream_flags.c | 6 | ||||
| -rw-r--r-- | tests/tests.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/test_block_header.c b/tests/test_block_header.c index a95792eb..3d9b5d93 100644 --- a/tests/test_block_header.c +++ b/tests/test_block_header.c @@ -211,7 +211,7 @@ test3(void) // Unsupported filter // NOTE: This may need updating when new IDs become supported. buf[2] ^= 0x1F; - integer_write_32(buf + known_options.header_size - 4, + unaligned_write32le(buf + known_options.header_size - 4, lzma_crc32(buf, known_options.header_size - 4, 0)); expect(lzma_block_header_decode(&decoded_options, NULL, buf) == LZMA_OPTIONS_ERROR); @@ -219,7 +219,7 @@ test3(void) // Non-nul Padding buf[known_options.header_size - 4 - 1] ^= 1; - integer_write_32(buf + known_options.header_size - 4, + unaligned_write32le(buf + known_options.header_size - 4, lzma_crc32(buf, known_options.header_size - 4, 0)); expect(lzma_block_header_decode(&decoded_options, NULL, buf) == LZMA_OPTIONS_ERROR); diff --git a/tests/test_stream_flags.c b/tests/test_stream_flags.c index 9c86c6b8..9611459e 100644 --- a/tests/test_stream_flags.c +++ b/tests/test_stream_flags.c @@ -133,13 +133,13 @@ test_decode_invalid(void) // Test 2a (valid CRC32) uint32_t crc = lzma_crc32(buffer + 6, 2, 0); - integer_write_32(buffer + 8, crc); + unaligned_write32le(buffer + 8, crc); succeed(test_header_decoder(LZMA_OK)); // Test 2b (invalid Stream Flags with valid CRC32) buffer[6] ^= 0x20; crc = lzma_crc32(buffer + 6, 2, 0); - integer_write_32(buffer + 8, crc); + unaligned_write32le(buffer + 8, crc); succeed(test_header_decoder(LZMA_OPTIONS_ERROR)); // Test 3 (invalid CRC32) @@ -151,7 +151,7 @@ test_decode_invalid(void) expect(lzma_stream_footer_encode(&known_flags, buffer) == LZMA_OK); buffer[9] ^= 0x40; crc = lzma_crc32(buffer + 4, 6, 0); - integer_write_32(buffer, crc); + unaligned_write32le(buffer, crc); succeed(test_footer_decoder(LZMA_OPTIONS_ERROR)); // Test 5 (invalid Magic Bytes) diff --git a/tests/tests.h b/tests/tests.h index 60a7276c..8f3c745d 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -14,7 +14,7 @@ #define LZMA_TESTS_H #include "sysdefs.h" -#include "integer.h" +#include "tuklib_integer.h" #include "lzma.h" #include <stdio.h> |