@@ -22,8 +22,6 @@ enum CiCommand {
22
22
Clippy ,
23
23
/// Check documentation
24
24
Docs ,
25
- /// Run default tests
26
- Test ,
27
25
/// Run tests with a specific feature set
28
26
TestFeatures {
29
27
#[ clap( subcommand) ]
@@ -84,7 +82,6 @@ impl CiArgs {
84
82
CiCommand :: Typos => check_typos ( ) ,
85
83
CiCommand :: Clippy => check_clippy ( ) ,
86
84
CiCommand :: Docs => check_docs ( ) ,
87
- CiCommand :: Test => run_tests ( ) ,
88
85
CiCommand :: TestFeatures { cmd } => run_feature_tests ( cmd) ,
89
86
CiCommand :: TestAppservice => run_appservice_tests ( ) ,
90
87
CiCommand :: Wasm { cmd } => run_wasm_checks ( cmd) ,
@@ -96,7 +93,6 @@ impl CiArgs {
96
93
check_clippy ( ) ?;
97
94
check_typos ( ) ?;
98
95
check_docs ( ) ?;
99
- run_tests ( ) ?;
100
96
run_feature_tests ( None ) ?;
101
97
run_appservice_tests ( ) ?;
102
98
run_wasm_checks ( None ) ?;
@@ -141,12 +137,6 @@ fn check_docs() -> Result<()> {
141
137
build_docs ( [ ] , DenyWarnings :: Yes )
142
138
}
143
139
144
- fn run_tests ( ) -> Result < ( ) > {
145
- cmd ! ( "rustup run stable cargo test" ) . run ( ) ?;
146
- cmd ! ( "rustup run beta cargo test" ) . run ( ) ?;
147
- Ok ( ( ) )
148
- }
149
-
150
140
fn run_feature_tests ( cmd : Option < FeatureSet > ) -> Result < ( ) > {
151
141
let args = BTreeMap :: from ( [
152
142
( FeatureSet :: NoEncryption , "--no-default-features --features sled,native-tls" ) ,
@@ -164,7 +154,12 @@ fn run_feature_tests(cmd: Option<FeatureSet>) -> Result<()> {
164
154
] ) ;
165
155
166
156
let run = |arg_set : & str | {
167
- cmd ! ( "rustup run stable cargo test -p matrix-sdk" ) . args ( arg_set. split_whitespace ( ) ) . run ( )
157
+ cmd ! ( "rustup run stable cargo nextest run -p matrix-sdk" )
158
+ . args ( arg_set. split_whitespace ( ) )
159
+ . run ( ) ?;
160
+ cmd ! ( "rustup run stable cargo test --doc -p matrix-sdk" )
161
+ . args ( arg_set. split_whitespace ( ) )
162
+ . run ( )
168
163
} ;
169
164
170
165
match cmd {
@@ -186,15 +181,17 @@ fn run_crypto_tests() -> Result<()> {
186
181
"rustup run stable cargo clippy -p matrix-sdk-crypto --features=backups_v1 -- -D warnings"
187
182
)
188
183
. run ( ) ?;
189
- cmd ! ( "rustup run stable cargo test -p matrix-sdk-crypto --features=backups_v1" ) . run ( ) ?;
190
- cmd ! ( "rustup run stable cargo test -p matrix-sdk-crypto-ffi" ) . run ( ) ?;
184
+ cmd ! ( "rustup run stable cargo nextest run -p matrix-sdk-crypto --features=backups_v1" ) . run ( ) ?;
185
+ cmd ! ( "rustup run stable cargo test --doc -p matrix-sdk-crypto --features=backups_v1" ) . run ( ) ?;
186
+ cmd ! ( "rustup run stable cargo nextest run -p matrix-sdk-crypto-ffi" ) . run ( ) ?;
191
187
192
188
Ok ( ( ) )
193
189
}
194
190
195
191
fn run_appservice_tests ( ) -> Result < ( ) > {
196
192
cmd ! ( "rustup run stable cargo clippy -p matrix-sdk-appservice -- -D warnings" ) . run ( ) ?;
197
- cmd ! ( "rustup run stable cargo test -p matrix-sdk-appservice" ) . run ( ) ?;
193
+ cmd ! ( "rustup run stable cargo nextest run -p matrix-sdk-appservice" ) . run ( ) ?;
194
+ cmd ! ( "rustup run stable cargo test --doc -p matrix-sdk-appservice" ) . run ( ) ?;
198
195
199
196
Ok ( ( ) )
200
197
}
0 commit comments