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.

Sign up for GitHub

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

Jump to bottom

compiletest: Fix a couple of test re-run issues #45917

Merged
merged 1 commit into from
Nov 13, 2017
Merged

compiletest: Fix a couple of test re-run issues #45917

merged 1 commit into from
Nov 13, 2017

Conversation

ollie27
Copy link
Member

@ollie27 ollie27 commented Nov 10, 2017

  • Re-run rustdoc tests if rustdoc or htmldocck.py was updated.
  • Put stamp files in the correct subdirectories to avoid clashes when
    the file names match but the subdirectory doesn't.

@ollie27
compiletest: Fix a couple of test re-run issues
ec15924 
* Re-run rustdoc tests if rustdoc or htmldocck.py was updated.
* Put stamp files in the correct subdirectories to avoid clashes when
the file names match but the subdirectory doesn't.
@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 10, 2017
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Nov 12, 2017

📌 Commit ec15924 has been approved by alexcrichton

@kennytm kennytm 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-review Status: Awaiting review from the assignee but also interested parties. labels Nov 12, 2017
@alexcrichton alexcrichton self-assigned this Nov 12, 2017
kennytm added a commit to kennytm/rust that referenced this pull request Nov 13, 2017
@kennytm
Rollup merge of rust-lang#45917 - ollie27:compiletest_stamp, r=alexcr…
5d9b63c 
…ichton

compiletest: Fix a couple of test re-run issues

* Re-run rustdoc tests if rustdoc or htmldocck.py was updated.
* Put stamp files in the correct subdirectories to avoid clashes when
the file names match but the subdirectory doesn't.
@kennytm kennytm mentioned this pull request Nov 13, 2017
Merged
bors added a commit that referenced this pull request Nov 13, 2017
@bors
Auto merge of #45956 - kennytm:rollup, r=kennytm
e312c8a 
Rollup of 9 pull requests

- Successful merges: #45828, #45892, #45893, #45914, #45917, #45927, #45933, #45952, #45954
- Failed merges:
@bors bors merged commit ec15924 into rust-lang:master Nov 13, 2017
@ollie27 ollie27 deleted the compiletest_stamp branch November 13, 2017 14:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ollie27 @alexcrichton @bors @kennytm