diff options
Diffstat (limited to 'xdelta3/xdelta3-test.h')
-rw-r--r-- | xdelta3/xdelta3-test.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xdelta3/xdelta3-test.h b/xdelta3/xdelta3-test.h index 9149348..6647cbf 100644 --- a/xdelta3/xdelta3-test.h +++ b/xdelta3/xdelta3-test.h | |||
@@ -1565,12 +1565,13 @@ test_compressed_stream_overflow (xd3_stream *stream, int ignore) | |||
1565 | { | 1565 | { |
1566 | ret = test_streaming (stream, buf, buf + (1 << 20), buf + (2 << 20), (1 << 12) + 1); | 1566 | ret = test_streaming (stream, buf, buf + (1 << 20), buf + (2 << 20), (1 << 12) + 1); |
1567 | 1567 | ||
1568 | if (ret == XD3_INTERNAL && MSG_IS ("decoder file offset overflow")) | 1568 | if (ret == XD3_INVALID_INPUT && MSG_IS ("decoder file offset overflow")) |
1569 | { | 1569 | { |
1570 | ret = 0; | 1570 | ret = 0; |
1571 | } | 1571 | } |
1572 | else | 1572 | else |
1573 | { | 1573 | { |
1574 | XPR(NT XD3_LIB_ERRMSG (stream, ret)); | ||
1574 | stream->msg = "expected overflow condition"; | 1575 | stream->msg = "expected overflow condition"; |
1575 | ret = XD3_INTERNAL; | 1576 | ret = XD3_INTERNAL; |
1576 | goto fail; | 1577 | goto fail; |
@@ -2715,9 +2716,6 @@ xd3_selftest (void) | |||
2715 | IF_GENCODETBL ( | 2716 | IF_GENCODETBL ( |
2716 | DO_TEST (decompress_single_bit_error, XD3_ALT_CODE_TABLE, 224)); | 2717 | DO_TEST (decompress_single_bit_error, XD3_ALT_CODE_TABLE, 224)); |
2717 | 2718 | ||
2718 | IF_DJW (DO_TEST (secondary_huff, 0, DJW_MAX_GROUPS)); | ||
2719 | IF_FGK (DO_TEST (secondary_fgk, 0, 1)); | ||
2720 | |||
2721 | #ifndef WIN32 | 2719 | #ifndef WIN32 |
2722 | DO_TEST (force_behavior, 0, 0); | 2720 | DO_TEST (force_behavior, 0, 0); |
2723 | DO_TEST (stdout_behavior, 0, 0); | 2721 | DO_TEST (stdout_behavior, 0, 0); |
@@ -2732,7 +2730,9 @@ xd3_selftest (void) | |||
2732 | 2730 | ||
2733 | #endif /* WIN32 */ | 2731 | #endif /* WIN32 */ |
2734 | 2732 | ||
2735 | /* This test takes a while. */ | 2733 | IF_DJW (DO_TEST (secondary_huff, 0, DJW_MAX_GROUPS)); |
2734 | IF_FGK (DO_TEST (secondary_fgk, 0, 1)); | ||
2735 | |||
2736 | DO_TEST (compressed_stream_overflow, 0, 0); | 2736 | DO_TEST (compressed_stream_overflow, 0, 0); |
2737 | 2737 | ||
2738 | failure: | 2738 | failure: |