1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
|
Index: adblock/src/blocker.rs
===================================================================
--- adblock.orig/src/blocker.rs
+++ adblock/src/blocker.rs
@@ -995,6 +995,7 @@ fn token_histogram<T>(filter_tokens: &[(
}
#[cfg(test)]
+#[cfg(feature = "embedded-domain-resolver")]
mod tests {
use super::*;
@@ -1296,6 +1297,7 @@ mod tests {
}
#[test]
+ #[cfg(feature = "full-regex-handling")]
fn network_filter_list_check_works_regex_escaping() {
let filters = [
r#"/^https?:\/\/.*(bitly|bit)\.(com|ly)\/.*/$domain=123movies.com|1337x.to"#,
@@ -1328,6 +1330,7 @@ mod tests {
}
#[cfg(test)]
+#[cfg(feature = "embedded-domain-resolver")]
mod blocker_tests {
use super::*;
@@ -2140,6 +2143,7 @@ fn test_removeparam_same_tokens() {
}
#[cfg(test)]
+#[cfg(feature = "embedded-domain-resolver")]
mod placeholder_string_tests {
/// If this changes, be sure to update the documentation for [`BlockerResult`] as well.
#[test]
Index: adblock/src/cosmetic_filter_cache.rs
===================================================================
--- adblock.orig/src/cosmetic_filter_cache.rs
+++ adblock/src/cosmetic_filter_cache.rs
@@ -554,6 +554,7 @@ fn hostname_domain_hashes(hostname: &str
}
#[cfg(test)]
+#[cfg(feature = "embedded-domain-resolver")]
mod cosmetic_cache_tests {
use super::*;
use crate::resources::Resource;
Index: adblock/src/engine.rs
===================================================================
--- adblock.orig/src/engine.rs
+++ adblock/src/engine.rs
@@ -252,6 +252,7 @@ fn _assertions() {
}
#[cfg(test)]
+#[cfg(feature = "embedded-domain-resolver")]
mod tests {
use super::*;
use crate::resources::MimeType;
@@ -619,6 +620,7 @@ mod tests {
}
#[test]
+ #[cfg(feature = "full-regex-handling")]
fn check_match_case_regex_filtering() {
{
// match case without regex is discarded
Index: adblock/src/optimizer.rs
===================================================================
--- adblock.orig/src/optimizer.rs
+++ adblock/src/optimizer.rs
@@ -202,6 +202,7 @@ impl Optimization for UnionDomainGroup {
*/
#[cfg(test)]
+#[cfg(feature = "embedded-domain-resolver")]
mod optimization_tests_pattern_group {
use super::*;
use crate::filters::network::CompiledRegex;
Index: adblock/src/request.rs
===================================================================
--- adblock.orig/src/request.rs
+++ adblock/src/request.rs
@@ -232,6 +232,7 @@ impl Request {
}
#[cfg(test)]
+#[cfg(feature = "embedded-domain-resolver")]
mod tests {
use super::*;
Index: adblock/src/filters/network.rs
===================================================================
--- adblock.orig/src/filters/network.rs
+++ adblock/src/filters/network.rs
@@ -2380,6 +2380,7 @@ mod parse_tests {
}
#[test]
+ #[cfg(all(feature = "embedded-domain-resolver", feature = "full-regex-handling"))]
fn parses_match_case() {
// match-case on non-regex rules is invalid
{
@@ -2785,6 +2786,7 @@ mod parse_tests {
}
#[cfg(test)]
+#[cfg(feature = "embedded-domain-resolver")]
mod match_tests {
use super::*;
@@ -3087,6 +3089,7 @@ mod match_tests {
}
#[test]
+ #[cfg(feature = "full-regex-handling")]
fn check_pattern_match_case() {
filter_match_url(r#"/BannerAd[0-9]/$match-case"#, "https://example.com/BannerAd0.gif", true);
filter_match_url(r#"/BannerAd[0-9]/$match-case"#, "https://example.com/bannerad0.gif", false);
@@ -3259,6 +3262,7 @@ mod match_tests {
}
#[test]
+ #[cfg(feature = "full-regex-handling")]
fn check_regex_escaping_handled() {
// A few rules that are not correctly escaped for rust Regex
{
Index: adblock/src/regex_manager.rs
===================================================================
--- adblock.orig/src/regex_manager.rs
+++ adblock/src/regex_manager.rs
@@ -251,6 +251,7 @@ mod tests {
}
#[test]
+ #[cfg(feature = "embedded-domain-resolver")]
fn simple_match() {
let mut regex_manager = RegexManager::default();
regex_manager.update_time();
@@ -262,6 +263,7 @@ mod tests {
}
#[test]
+ #[cfg(feature = "embedded-domain-resolver")]
fn discard_and_recreate() {
let mut regex_manager = RegexManager::default();
regex_manager.update_time();
|
