|
36 | 36 | //! a problem. |
37 | 37 | //! - Carriage returns are removed, which can help when running on Windows. |
38 | 38 |
|
39 | | -use crate::diff; |
| 39 | +use crate::cross_compile::try_alternate; |
40 | 40 | use crate::paths; |
| 41 | +use crate::{diff, rustc_host}; |
41 | 42 | use anyhow::{bail, Context, Result}; |
42 | 43 | use serde_json::Value; |
43 | 44 | use std::fmt; |
44 | 45 | use std::path::Path; |
45 | 46 | use std::str; |
46 | 47 | use url::Url; |
47 | 48 |
|
| 49 | +/// This makes it easier to write regex replacements that are guaranteed to only |
| 50 | +/// get compiled once |
| 51 | +macro_rules! regex { |
| 52 | + ($re:literal $(,)?) => {{ |
| 53 | + static RE: std::sync::OnceLock<regex::Regex> = std::sync::OnceLock::new(); |
| 54 | + RE.get_or_init(|| regex::Regex::new($re).unwrap()) |
| 55 | + }}; |
| 56 | +} |
| 57 | + |
48 | 58 | /// Assertion policy for UI tests |
49 | 59 | /// |
50 | 60 | /// This emphasizes showing as much content as possible at the cost of more brittleness |
@@ -77,37 +87,8 @@ use url::Url; |
77 | 87 | /// a problem. |
78 | 88 | /// - Carriage returns are removed, which can help when running on Windows. |
79 | 89 | pub fn assert_ui() -> snapbox::Assert { |
80 | | - let root = paths::root(); |
81 | | - // Use `from_file_path` instead of `from_dir_path` so the trailing slash is |
82 | | - // put in the users output, rather than hidden in the variable |
83 | | - let root_url = url::Url::from_file_path(&root).unwrap().to_string(); |
84 | | - |
85 | 90 | let mut subs = snapbox::Redactions::new(); |
86 | | - subs.extend(MIN_LITERAL_REDACTIONS.into_iter().cloned()) |
87 | | - .unwrap(); |
88 | | - subs.insert("[ROOT]", root).unwrap(); |
89 | | - subs.insert("[ROOTURL]", root_url).unwrap(); |
90 | | - subs.insert( |
91 | | - "[ELAPSED]", |
92 | | - regex::Regex::new("Finished.*in (?<redacted>[0-9]+(\\.[0-9]+))s").unwrap(), |
93 | | - ) |
94 | | - .unwrap(); |
95 | | - // output from libtest |
96 | | - subs.insert( |
97 | | - "[ELAPSED]", |
98 | | - regex::Regex::new("; finished in (?<redacted>[0-9]+(\\.[0-9]+))s").unwrap(), |
99 | | - ) |
100 | | - .unwrap(); |
101 | | - subs.insert( |
102 | | - "[FILE_SIZE]", |
103 | | - regex::Regex::new("(?<redacted>[0-9]+(\\.[0-9]+)([a-zA-Z]i)?)B").unwrap(), |
104 | | - ) |
105 | | - .unwrap(); |
106 | | - subs.insert( |
107 | | - "[HASH]", |
108 | | - regex::Regex::new("home/\\.cargo/registry/src/-(?<redacted>[a-z0-9]+)").unwrap(), |
109 | | - ) |
110 | | - .unwrap(); |
| 91 | + add_common_redactions(&mut subs); |
111 | 92 | snapbox::Assert::new() |
112 | 93 | .action_env(snapbox::assert::DEFAULT_ACTION_ENV) |
113 | 94 | .redact_with(subs) |
@@ -145,48 +126,80 @@ pub fn assert_ui() -> snapbox::Assert { |
145 | 126 | /// a problem. |
146 | 127 | /// - Carriage returns are removed, which can help when running on Windows. |
147 | 128 | pub fn assert_e2e() -> snapbox::Assert { |
| 129 | + let mut subs = snapbox::Redactions::new(); |
| 130 | + add_common_redactions(&mut subs); |
| 131 | + subs.extend(E2E_LITERAL_REDACTIONS.into_iter().cloned()) |
| 132 | + .unwrap(); |
| 133 | + |
| 134 | + snapbox::Assert::new() |
| 135 | + .action_env(snapbox::assert::DEFAULT_ACTION_ENV) |
| 136 | + .redact_with(subs) |
| 137 | +} |
| 138 | + |
| 139 | +fn add_common_redactions(subs: &mut snapbox::Redactions) { |
148 | 140 | let root = paths::root(); |
149 | 141 | // Use `from_file_path` instead of `from_dir_path` so the trailing slash is |
150 | 142 | // put in the users output, rather than hidden in the variable |
151 | 143 | let root_url = url::Url::from_file_path(&root).unwrap().to_string(); |
152 | 144 |
|
153 | | - let mut subs = snapbox::Redactions::new(); |
154 | 145 | subs.extend(MIN_LITERAL_REDACTIONS.into_iter().cloned()) |
155 | 146 | .unwrap(); |
156 | | - subs.extend(E2E_LITERAL_REDACTIONS.into_iter().cloned()) |
157 | | - .unwrap(); |
158 | 147 | subs.insert("[ROOT]", root).unwrap(); |
159 | 148 | subs.insert("[ROOTURL]", root_url).unwrap(); |
| 149 | + // For e2e tests |
160 | 150 | subs.insert( |
161 | 151 | "[ELAPSED]", |
162 | | - regex::Regex::new("[FINISHED].*in (?<redacted>[0-9]+(\\.[0-9]+))s").unwrap(), |
| 152 | + regex!("[FINISHED].*in (?<redacted>[0-9]+(\\.[0-9]+))s"), |
| 153 | + ) |
| 154 | + .unwrap(); |
| 155 | + // for UI tests |
| 156 | + subs.insert( |
| 157 | + "[ELAPSED]", |
| 158 | + regex!("Finished.*in (?<redacted>[0-9]+(\\.[0-9]+))s"), |
163 | 159 | ) |
164 | 160 | .unwrap(); |
165 | 161 | // output from libtest |
166 | 162 | subs.insert( |
167 | 163 | "[ELAPSED]", |
168 | | - regex::Regex::new("; finished in (?<redacted>[0-9]+(\\.[0-9]+))s").unwrap(), |
| 164 | + regex!("; finished in (?<redacted>[0-9]+(\\.[0-9]+))s"), |
169 | 165 | ) |
170 | 166 | .unwrap(); |
171 | 167 | subs.insert( |
172 | 168 | "[FILE_SIZE]", |
173 | | - regex::Regex::new("(?<redacted>[0-9]+(\\.[0-9]+)([a-zA-Z]i)?)B").unwrap(), |
| 169 | + regex!("(?<redacted>[0-9]+(\\.[0-9]+)([a-zA-Z]i)?)B"), |
174 | 170 | ) |
175 | 171 | .unwrap(); |
176 | 172 | subs.insert( |
177 | 173 | "[HASH]", |
178 | | - regex::Regex::new("home/\\.cargo/registry/src/-(?<redacted>[a-z0-9]+)").unwrap(), |
| 174 | + regex!("home/\\.cargo/registry/src/-(?<redacted>[a-z0-9]+)"), |
| 175 | + ) |
| 176 | + .unwrap(); |
| 177 | + subs.insert("[HASH]", regex!("/[a-z0-9\\-_]+-(?<redacted>[0-9a-f]{16})")) |
| 178 | + .unwrap(); |
| 179 | + subs.insert("[HOST_TARGET]", rustc_host()).unwrap(); |
| 180 | + if let Some(alt_target) = try_alternate() { |
| 181 | + subs.insert("[ALT_TARGET]", alt_target).unwrap(); |
| 182 | + } |
| 183 | + subs.insert( |
| 184 | + "[AVG_ELAPSED]", |
| 185 | + regex!("(?<redacted>[0-9]+(\\.[0-9]+)?) ns/iter"), |
| 186 | + ) |
| 187 | + .unwrap(); |
| 188 | + subs.insert( |
| 189 | + "[JITTER]", |
| 190 | + regex!("ns/iter \\(\\+/- (?<redacted>[0-9]+(\\.[0-9]+)?)\\)"), |
179 | 191 | ) |
180 | 192 | .unwrap(); |
181 | | - snapbox::Assert::new() |
182 | | - .action_env(snapbox::assert::DEFAULT_ACTION_ENV) |
183 | | - .redact_with(subs) |
184 | 193 | } |
185 | 194 |
|
186 | 195 | static MIN_LITERAL_REDACTIONS: &[(&str, &str)] = &[ |
187 | 196 | ("[EXE]", std::env::consts::EXE_SUFFIX), |
188 | 197 | ("[BROKEN_PIPE]", "Broken pipe (os error 32)"), |
189 | 198 | ("[BROKEN_PIPE]", "The pipe is being closed. (os error 232)"), |
| 199 | + // Unix message for exit status |
| 200 | + ("[EXIT_STATUS]", "exit status"), |
| 201 | + // Windows message for exit status |
| 202 | + ("[EXIT_STATUS]", "exit code"), |
190 | 203 | ]; |
191 | 204 | static E2E_LITERAL_REDACTIONS: &[(&str, &str)] = &[ |
192 | 205 | ("[RUNNING]", " Running"), |
|
0 commit comments