Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run tests for the cargo submodule in tree #41362

Merged
merged 1 commit into from
Apr 25, 2017

Conversation

alexcrichton
Copy link
Member

Previously the cargotest suite would run some arbitrary revision of Cargo's
test suite, but now that we're bundling it in tree we should be running the
Cargo submodule's test suite instead.

@rust-highfive
Copy link
Collaborator

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@arielb1
Copy link
Contributor

arielb1 commented Apr 18, 2017

    // One of the projects being tested here is Cargo, and when being tested
    // Cargo will at some point call `nmake.exe` on Windows MSVC. Unfortunately
    // `nmake` will read these two environment variables below and try to
    // intepret them. We're likely being run, however, from MSYS `make` which
    // uses the same variables.
    //
    // As a result, to prevent confusion and errors, we remove these variables
    // from our environment to prevent passing MSYS make flags to nmake, causing
    // it to blow up.
    if cfg!(target_env = "msvc") {
        env::remove_var("MAKE");
        env::remove_var("MAKEFLAGS");
    }

@alexcrichton
Copy link
Member Author

Nice catch! Moved over to rustbuild

@aturon
Copy link
Member

aturon commented Apr 18, 2017

@bors: r+

@bors
Copy link
Contributor

bors commented Apr 18, 2017

📌 Commit 2c9d756 has been approved by aturon

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 18, 2017
Run tests for the cargo submodule in tree

Previously the `cargotest` suite would run some arbitrary revision of Cargo's
test suite, but now that we're bundling it in tree we should be running the
Cargo submodule's test suite instead.
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 18, 2017
Run tests for the cargo submodule in tree

Previously the `cargotest` suite would run some arbitrary revision of Cargo's
test suite, but now that we're bundling it in tree we should be running the
Cargo submodule's test suite instead.
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 18, 2017
Run tests for the cargo submodule in tree

Previously the `cargotest` suite would run some arbitrary revision of Cargo's
test suite, but now that we're bundling it in tree we should be running the
Cargo submodule's test suite instead.
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 19, 2017
Run tests for the cargo submodule in tree

Previously the `cargotest` suite would run some arbitrary revision of Cargo's
test suite, but now that we're bundling it in tree we should be running the
Cargo submodule's test suite instead.
@aidanhs aidanhs added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 19, 2017
@bors
Copy link
Contributor

bors commented Apr 19, 2017

⌛ Testing commit 2c9d756 with merge b12057c...

@bors
Copy link
Contributor

bors commented Apr 19, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member Author

@bors: retry

@bors
Copy link
Contributor

bors commented Apr 20, 2017

⌛ Testing commit 2c9d756 with merge da63ca9...

@bors
Copy link
Contributor

bors commented Apr 21, 2017

⌛ Testing commit 787f98d with merge 33ba984...

@bors
Copy link
Contributor

bors commented Apr 21, 2017

💔 Test failed - status-travis

@frewsxcv
Copy link
Member

@bors retry #40417

@bors
Copy link
Contributor

bors commented Apr 22, 2017

☔ The latest upstream changes (presumably #41464) made this pull request unmergeable. Please resolve the merge conflicts.

@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 23, 2017
Previously the `cargotest` suite would run some arbitrary revision of Cargo's
test suite, but now that we're bundling it in tree we should be running the
Cargo submodule's test suite instead.
@alexcrichton
Copy link
Member Author

@bors: r=aturon

@bors
Copy link
Contributor

bors commented Apr 24, 2017

📌 Commit 009f45f has been approved by aturon

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 24, 2017
Run tests for the cargo submodule in tree

Previously the `cargotest` suite would run some arbitrary revision of Cargo's
test suite, but now that we're bundling it in tree we should be running the
Cargo submodule's test suite instead.
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 24, 2017
Run tests for the cargo submodule in tree

Previously the `cargotest` suite would run some arbitrary revision of Cargo's
test suite, but now that we're bundling it in tree we should be running the
Cargo submodule's test suite instead.
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 25, 2017
Run tests for the cargo submodule in tree

Previously the `cargotest` suite would run some arbitrary revision of Cargo's
test suite, but now that we're bundling it in tree we should be running the
Cargo submodule's test suite instead.
@arielb1 arielb1 added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 25, 2017
bors added a commit that referenced this pull request Apr 25, 2017
Run tests for the cargo submodule in tree

Previously the `cargotest` suite would run some arbitrary revision of Cargo's
test suite, but now that we're bundling it in tree we should be running the
Cargo submodule's test suite instead.
@bors
Copy link
Contributor

bors commented Apr 25, 2017

⌛ Testing commit 009f45f with merge 2b4c911...

@bors
Copy link
Contributor

bors commented Apr 25, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: aturon
Pushing 2b4c911 to master...

@bors bors merged commit 009f45f into rust-lang:master Apr 25, 2017
@alexcrichton alexcrichton deleted the run-cargot-ests branch May 4, 2017 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants