summaryrefslogtreecommitdiff
path: root/xdelta3/xdelta3-test.h
diff options
context:
space:
mode:
Diffstat (limited to 'xdelta3/xdelta3-test.h')
-rw-r--r--xdelta3/xdelta3-test.h17
1 files changed, 3 insertions, 14 deletions
diff --git a/xdelta3/xdelta3-test.h b/xdelta3/xdelta3-test.h
index f4d5972..248691c 100644
--- a/xdelta3/xdelta3-test.h
+++ b/xdelta3/xdelta3-test.h
@@ -693,11 +693,8 @@ test_compress_text (xd3_stream *stream,
693 cfg.smatcher_soft.small_look = 4; 693 cfg.smatcher_soft.small_look = 4;
694 cfg.smatcher_soft.small_chain = 128; 694 cfg.smatcher_soft.small_chain = 128;
695 cfg.smatcher_soft.small_lchain = 16; 695 cfg.smatcher_soft.small_lchain = 16;
696 cfg.smatcher_soft.ssmatch = 0;
697 cfg.smatcher_soft.try_lazy = 1;
698 cfg.smatcher_soft.max_lazy = 8; 696 cfg.smatcher_soft.max_lazy = 8;
699 cfg.smatcher_soft.long_enough = 128; 697 cfg.smatcher_soft.long_enough = 128;
700 cfg.smatcher_soft.promote = 0;
701 698
702 xd3_config_stream (stream, & cfg); 699 xd3_config_stream (stream, & cfg);
703 700
@@ -1959,9 +1956,7 @@ typedef struct _string_match_test string_match_test;
1959typedef enum 1956typedef enum
1960{ 1957{
1961 SM_NONE = 0, 1958 SM_NONE = 0,
1962 SM_SSMATCH = (1 << 0),
1963 SM_LAZY = (1 << 1), 1959 SM_LAZY = (1 << 1),
1964 SM_PROMOTE = (1 << 2),
1965} string_match_flags; 1960} string_match_flags;
1966 1961
1967struct _string_match_test 1962struct _string_match_test
@@ -1985,7 +1980,7 @@ static const string_match_test match_tests[] =
1985 1980
1986 /* simple promotion: the third copy address depends on promotion */ 1981 /* simple promotion: the third copy address depends on promotion */
1987 { "ABCDEF_ABCDEF^ABCDEF", SM_NONE, "C7/6@0 C14/6@7" }, 1982 { "ABCDEF_ABCDEF^ABCDEF", SM_NONE, "C7/6@0 C14/6@7" },
1988 { "ABCDEF_ABCDEF^ABCDEF", SM_PROMOTE, "C7/6@0 C14/6@0" }, 1983 /* { "ABCDEF_ABCDEF^ABCDEF", SM_PROMOTE, "C7/6@0 C14/6@0" }, forgotten */
1989 1984
1990 /* simple lazy: there is a better copy starting with "23 X" than "123 " */ 1985 /* simple lazy: there is a better copy starting with "23 X" than "123 " */
1991 { "123 23 XYZ 123 XYZ", SM_NONE, "C11/4@0" }, 1986 { "123 23 XYZ 123 XYZ", SM_NONE, "C11/4@0" },
@@ -2018,7 +2013,7 @@ static const string_match_test match_tests[] =
2018 2013
2019 /* ssmatch test */ 2014 /* ssmatch test */
2020 { "ABCDE___ABCDE*** BCDE***", SM_NONE, "C8/5@0 C17/4@1" }, 2015 { "ABCDE___ABCDE*** BCDE***", SM_NONE, "C8/5@0 C17/4@1" },
2021 { "ABCDE___ABCDE*** BCDE***", SM_SSMATCH, "C8/5@0 C17/7@9" }, 2016 /*{ "ABCDE___ABCDE*** BCDE***", SM_SSMATCH, "C8/5@0 C17/7@9" }, forgotten */
2022}; 2017};
2023 2018
2024static int 2019static int
@@ -2043,11 +2038,8 @@ test_string_matching (xd3_stream *stream, int ignore)
2043 config.smatcher_soft.small_look = 4; 2038 config.smatcher_soft.small_look = 4;
2044 config.smatcher_soft.small_chain = 10; 2039 config.smatcher_soft.small_chain = 10;
2045 config.smatcher_soft.small_lchain = 10; 2040 config.smatcher_soft.small_lchain = 10;
2046 config.smatcher_soft.max_lazy = 10; 2041 config.smatcher_soft.max_lazy = (test->flags & SM_LAZY) ? 10 : 0;
2047 config.smatcher_soft.long_enough = 10; 2042 config.smatcher_soft.long_enough = 10;
2048 config.smatcher_soft.ssmatch = (test->flags & SM_SSMATCH) && 1;
2049 config.smatcher_soft.try_lazy = (test->flags & SM_LAZY) && 1;
2050 config.smatcher_soft.promote = (test->flags & SM_PROMOTE) && 1;
2051 2043
2052 if ((ret = xd3_config_stream (stream, & config))) { return ret; } 2044 if ((ret = xd3_config_stream (stream, & config))) { return ret; }
2053 if ((ret = xd3_encode_init (stream))) { return ret; } 2045 if ((ret = xd3_encode_init (stream))) { return ret; }
@@ -2122,11 +2114,8 @@ test_iopt_flush_instructions (xd3_stream *stream, int ignore)
2122 config.smatcher_soft.small_look = 4; 2114 config.smatcher_soft.small_look = 4;
2123 config.smatcher_soft.small_chain = 128; 2115 config.smatcher_soft.small_chain = 128;
2124 config.smatcher_soft.small_lchain = 16; 2116 config.smatcher_soft.small_lchain = 16;
2125 config.smatcher_soft.ssmatch = 0;
2126 config.smatcher_soft.try_lazy = 1;
2127 config.smatcher_soft.max_lazy = 8; 2117 config.smatcher_soft.max_lazy = 8;
2128 config.smatcher_soft.long_enough = 128; 2118 config.smatcher_soft.long_enough = 128;
2129 config.smatcher_soft.promote = 0;
2130 2119
2131 if ((ret = xd3_config_stream (stream, & config))) { return ret; } 2120 if ((ret = xd3_config_stream (stream, & config))) { return ret; }
2132 2121