Skip to content

Fix revision support for UI tests. #49812

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

Merged
merged 2 commits into from
Apr 24, 2018
Merged

Fix revision support for UI tests. #49812

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf816a2
Fix revision support for UI tests.
ehuss Apr 9, 2018
c3af118
Add doc for output_base_name_stage.
ehuss Apr 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add doc for output_base_name_stage.
  • Loading branch information
@ehuss
ehuss committed Apr 20, 2018
commit c3af11808640c2a77a474bcd09b61e63d4553917
2 changes: 2 additions & 0 deletions src/tools/compiletest/src/runtest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1878,6 +1878,8 @@ impl<'test> TestCx<'test> {
dir.join(&self.output_testname(&self.testpaths.file))
}

/// Same as `output_base_name`, but includes the stage ID as an extension,
/// such as: `.../compile-fail/foo/bar.stage1-<triple>`
fn output_base_name_stage(&self) -> PathBuf {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe a comment?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this returns foo/bar.stage1, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stage also includes the platform triple (like foo/bar.stage1-x86_64-apple-darwin). That is...a little confusing. :)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok -- in any case I'd like to see a comment =)

self.output_base_name().with_extension(&self.config.stage_id)
}
Expand Down