Skip to content

Commit 02cd58e

Browse files
committed
xtask: add --features testing to most testing tasks
1 parent 79f68ed commit 02cd58e

File tree

1 file changed

+22
-15
lines changed

1 file changed

+22
-15
lines changed

xtask/src/ci.rs

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -195,18 +195,21 @@ fn run_feature_tests(cmd: Option<FeatureSet>) -> Result<()> {
195195
let args = BTreeMap::from([
196196
(
197197
FeatureSet::NoEncryption,
198-
"--no-default-features --features sqlite,native-tls,experimental-sliding-sync",
198+
"--no-default-features --features sqlite,native-tls,experimental-sliding-sync,testing",
199199
),
200-
(FeatureSet::NoSqlite, "--no-default-features --features e2e-encryption,native-tls"),
201-
(FeatureSet::NoEncryptionAndSqlite, "--no-default-features --features native-tls"),
200+
(
201+
FeatureSet::NoSqlite,
202+
"--no-default-features --features e2e-encryption,native-tls,testing",
203+
),
204+
(FeatureSet::NoEncryptionAndSqlite, "--no-default-features --features native-tls,testing"),
202205
(
203206
FeatureSet::SqliteCryptostore,
204-
"--no-default-features --features e2e-encryption,sqlite,native-tls",
207+
"--no-default-features --features e2e-encryption,sqlite,native-tls,testing",
205208
),
206-
(FeatureSet::RustlsTls, "--no-default-features --features rustls-tls"),
207-
(FeatureSet::Markdown, "--features markdown"),
208-
(FeatureSet::Socks, "--features socks"),
209-
(FeatureSet::SsoLogin, "--features sso-login"),
209+
(FeatureSet::RustlsTls, "--no-default-features --features rustls-tls,testing"),
210+
(FeatureSet::Markdown, "--features markdown,testing"),
211+
(FeatureSet::Socks, "--features socks,testing"),
212+
(FeatureSet::SsoLogin, "--features sso-login,testing"),
210213
]);
211214

212215
let run = |arg_set: &str| {
@@ -237,25 +240,29 @@ fn run_crypto_tests() -> Result<()> {
237240
"rustup run stable cargo clippy -p matrix-sdk-crypto --features=backups_v1 -- -D warnings"
238241
)
239242
.run()?;
240-
cmd!("rustup run stable cargo nextest run -p matrix-sdk-crypto --no-default-features").run()?;
241-
cmd!("rustup run stable cargo nextest run -p matrix-sdk-crypto --features=backups_v1").run()?;
242-
cmd!("rustup run stable cargo test --doc -p matrix-sdk-crypto --features=backups_v1").run()?;
243+
cmd!("rustup run stable cargo nextest run -p matrix-sdk-crypto --no-default-features --features testing").run()?;
244+
cmd!("rustup run stable cargo nextest run -p matrix-sdk-crypto --features=backups_v1,testing")
245+
.run()?;
246+
cmd!("rustup run stable cargo test --doc -p matrix-sdk-crypto --features=backups_v1,testing")
247+
.run()?;
243248
cmd!(
244249
"rustup run stable cargo clippy -p matrix-sdk-crypto --features=experimental-algorithms -- -D warnings"
245250
)
246251
.run()?;
247252
cmd!(
248-
"rustup run stable cargo nextest run -p matrix-sdk-crypto --features=experimental-algorithms"
253+
"rustup run stable cargo nextest run -p matrix-sdk-crypto --features=experimental-algorithms,testing"
249254
).run()?;
250255
cmd!(
251-
"rustup run stable cargo test --doc -p matrix-sdk-crypto --features=experimental-algorithms"
256+
"rustup run stable cargo test --doc -p matrix-sdk-crypto --features=experimental-algorithms,testing"
252257
)
253258
.run()?;
254259

255260
cmd!("rustup run stable cargo nextest run -p matrix-sdk-crypto-ffi").run()?;
256261

257-
cmd!("rustup run stable cargo nextest run -p matrix-sdk-sqlite --features crypto-store")
258-
.run()?;
262+
cmd!(
263+
"rustup run stable cargo nextest run -p matrix-sdk-sqlite --features crypto-store,testing"
264+
)
265+
.run()?;
259266

260267
Ok(())
261268
}

0 commit comments

Comments
 (0)