Skip to content

Commit c94d21c

Browse files
Nemo157syphar
authored andcommitted
Update toolchain before running build-tests
1 parent bb56ed8 commit c94d21c

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

src/docbuilder/rustwide_builder.rs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -934,6 +934,7 @@ mod tests {
934934
storage.store_one(&old_source_file, Vec::new())?;
935935

936936
let mut builder = RustwideBuilder::init(env).unwrap();
937+
builder.update_toolchain()?;
937938
assert!(builder.build_package(crate_, version, PackageKind::CratesIo)?);
938939

939940
// check release record in the db (default and other targets)
@@ -1065,6 +1066,7 @@ mod tests {
10651066
storage.store_one(&old_source_file, Vec::new())?;
10661067

10671068
let mut builder = RustwideBuilder::init(env).unwrap();
1069+
builder.update_toolchain()?;
10681070
assert!(!builder.build_package(crate_, version, PackageKind::CratesIo)?);
10691071

10701072
// check release record in the db (default and other targets)
@@ -1112,6 +1114,7 @@ mod tests {
11121114
let crate_ = "thiserror-impl";
11131115
let version = "1.0.26";
11141116
let mut builder = RustwideBuilder::init(env).unwrap();
1117+
builder.update_toolchain()?;
11151118
assert!(builder.build_package(crate_, version, PackageKind::CratesIo)?);
11161119

11171120
let storage = env.storage();
@@ -1135,6 +1138,7 @@ mod tests {
11351138
let crate_ = "windows-win";
11361139
let version = "2.4.1";
11371140
let mut builder = RustwideBuilder::init(env).unwrap();
1141+
builder.update_toolchain()?;
11381142
if builder.toolchain.as_ci().is_some() {
11391143
return Ok(());
11401144
}
@@ -1187,6 +1191,7 @@ mod tests {
11871191
let crate_ = "docs_rs_test_incorrect_lockfile";
11881192
let version = "0.1.2";
11891193
let mut builder = RustwideBuilder::init(env).unwrap();
1194+
builder.update_toolchain()?;
11901195
assert!(builder.build_package(crate_, version, PackageKind::CratesIo)?);
11911196

11921197
Ok(())
@@ -1209,6 +1214,7 @@ mod tests {
12091214
let crate_ = "docs_rs_test_incorrect_lockfile";
12101215
let version = "0.2.0";
12111216
let mut builder = RustwideBuilder::init(env).unwrap();
1217+
builder.update_toolchain()?;
12121218
assert!(builder.build_package(crate_, version, PackageKind::CratesIo)?);
12131219

12141220
Ok(())
@@ -1222,6 +1228,7 @@ mod tests {
12221228
let crate_ = "proc-macro2";
12231229
let version = "1.0.33";
12241230
let mut builder = RustwideBuilder::init(env).unwrap();
1231+
builder.update_toolchain()?;
12251232
assert!(builder.build_package(crate_, version, PackageKind::CratesIo)?);
12261233
Ok(())
12271234
});
@@ -1234,6 +1241,7 @@ mod tests {
12341241
let crate_ = "serde";
12351242
let version = "1.0.152";
12361243
let mut builder = RustwideBuilder::init(env).unwrap();
1244+
builder.update_toolchain()?;
12371245
assert!(builder.build_package(crate_, version, PackageKind::CratesIo)?);
12381246

12391247
let mut conn = env.db().conn();
@@ -1260,6 +1268,7 @@ mod tests {
12601268
let crate_ = "stylish-core";
12611269
let version = "0.1.1";
12621270
let mut builder = RustwideBuilder::init(env).unwrap();
1271+
builder.update_toolchain()?;
12631272
assert!(builder.build_package(crate_, version, PackageKind::CratesIo)?);
12641273

12651274
let mut conn = env.db().conn();
@@ -1283,8 +1292,9 @@ mod tests {
12831292
#[ignore]
12841293
fn test_build_std() {
12851294
wrapper(|env| {
1286-
assert!(RustwideBuilder::init(env)?
1287-
.build_local_package(Path::new("tests/crates/build-std"))?);
1295+
let mut builder = RustwideBuilder::init(env)?;
1296+
builder.update_toolchain()?;
1297+
assert!(builder.build_local_package(Path::new("tests/crates/build-std"))?);
12881298
Ok(())
12891299
})
12901300
}
@@ -1294,6 +1304,7 @@ mod tests {
12941304
fn test_workspace_reinitialize_at_once() {
12951305
wrapper(|env| {
12961306
let mut builder = RustwideBuilder::init(env)?;
1307+
builder.update_toolchain()?;
12971308
builder.reinitialize_workspace_if_interval_passed(env)?;
12981309
assert!(builder.build_local_package(Path::new("tests/crates/build-std"))?);
12991310
Ok(())
@@ -1310,6 +1321,7 @@ mod tests {
13101321
cfg.build_workspace_reinitialization_interval = Duration::from_secs(1)
13111322
});
13121323
let mut builder = RustwideBuilder::init(env)?;
1324+
builder.update_toolchain()?;
13131325
assert!(builder.build_local_package(Path::new("tests/crates/build-std"))?);
13141326
sleep(Duration::from_secs(1));
13151327
builder.reinitialize_workspace_if_interval_passed(env)?;

0 commit comments

Comments
 (0)