Partially sync normalize_output to upstream, for $TEST_BUILD_DIR support.
#241
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eddyb
changed the title
normalize_output to upstream, for $TEST_BUILD_DIR support.normalize_output to upstream, for $TEST_BUILD_DIR support.
eddyb
changed the title
normalize_output to upstream, for $TEST_BUILD_DIR support.normalize_output to upstream, for $TEST_BUILD_DIR support.
Munksgaard
approved these changes
Mar 21, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I've effectively copied this part of the upstream
compiletest: https://github.com/rust-lang/rust/blob/41b315a470d583f6446599984ff9ad3bd61012b2/src/tools/compiletest/src/runtest.rs#L3581-L3626But only kept these path normalizations:
$DIR$TEST_BUILD_DIRUpstream also has these, that I removed (as they only make sense in the context of building Rust itself):
$SRC_DIR = ${config.src_base}/../../../library(where../../..strips e.g.src/test/ui)$BUILD_DIR = $TEST_BUILD_DIR/../../..(where../../..strips e.g.x86_64-unknown-linux-gnu/test/ui)$LIB_DIR = $BUILD_DIR/../lib(where..stripsbuild, but AFAICT top-levellibnever existed?!)EDIT: made this into a draft because something is missing for windows support - see this CI failure.EDIT2: false alarm, it was caused by diagnostics printing paths with
{:?}, which causes\\on windows.