Skip to content

Commit

Permalink
Fixes for new cargo test repos
Browse files Browse the repository at this point in the history
* Update to ripgrep HEAD because the previous rev would still change the lock
  file when `cargo build` was issued.
* Remove `bins` as it depends on OpenSSL on Windows, which won't work on our
  bots
* Update rev of tokei to get a rev that doesn't change the lockfile
  • Loading branch information
alexcrichton committed Dec 29, 2016
1 parent 9958021 commit a0f3c93
Showing 1 changed file with 38 additions and 42 deletions.
80 changes: 38 additions & 42 deletions src/tools/cargotest/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,48 +21,44 @@ struct Test {
lock: Option<&'static str>,
}

const TEST_REPOS: &'static [Test] = &[Test {
name: "bins",
repo: "https://github.com/jkcclemens/bins",
sha: "378da8f7d78df6e3ff0b234063de50619b16648e",
lock: None,
},
Test {
name: "cargo",
repo: "https://github.com/rust-lang/cargo",
sha: "b7be4f2ef2cf743492edc6dfb55d087ed88f2d76",
lock: None,
},
Test {
name: "iron",
repo: "https://github.com/iron/iron",
sha: "16c858ec2901e2992fe5e529780f59fa8ed12903",
lock: Some(include_str!("lockfiles/iron-Cargo.lock")),
},
Test {
name: "ripgrep",
repo: "https://github.com/BurntSushi/ripgrep",
sha: "5487dffefaa34e5fc04321335aa716f415082977",
lock: None,
},
Test {
name: "tokei",
repo: "https://github.com/Aaronepower/tokei",
sha: "9faa8d4210ba19ad76d736e46e4963cfcef329d6",
lock: None,
},
Test {
name: "treeify",
repo: "https://github.com/dzamlo/treeify",
sha: "999001b223152441198f117a68fb81f57bc086dd",
lock: None,
},
Test {
name: "xsv",
repo: "https://github.com/BurntSushi/xsv",
sha: "5ec4fff4a3f507eda887049469897f02c6fae036",
lock: None,
}];
const TEST_REPOS: &'static [Test] = &[
Test {
name: "cargo",
repo: "https://github.com/rust-lang/cargo",
sha: "b7be4f2ef2cf743492edc6dfb55d087ed88f2d76",
lock: None,
},
Test {
name: "iron",
repo: "https://github.com/iron/iron",
sha: "16c858ec2901e2992fe5e529780f59fa8ed12903",
lock: Some(include_str!("lockfiles/iron-Cargo.lock")),
},
Test {
name: "ripgrep",
repo: "https://github.com/BurntSushi/ripgrep",
sha: "b65bb37b14655e1a89c7cd19c8b011ef3e312791",
lock: None,
},
Test {
name: "tokei",
repo: "https://github.com/Aaronepower/tokei",
sha: "5e11c4852fe4aa086b0e4fe5885822fbe57ba928",
lock: None,
},
Test {
name: "treeify",
repo: "https://github.com/dzamlo/treeify",
sha: "999001b223152441198f117a68fb81f57bc086dd",
lock: None,
},
Test {
name: "xsv",
repo: "https://github.com/BurntSushi/xsv",
sha: "5ec4fff4a3f507eda887049469897f02c6fae036",
lock: None,
},
];

fn main() {
// One of the projects being tested here is Cargo, and when being tested
Expand Down

0 comments on commit a0f3c93

Please sign in to comment.