[Tests] Replace %{built_tests_dir} with %T #130
Merged
Conversation
This file contains hidden or 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
When I first added functional tests in 589b23d, I struggled against `lit`'s design: I attempted to prevent test output from being generated alongside the tests themselves. It wasn't until 8181c16 that I saw the error of my ways: `lit` places test output in the next to the tests in order to make them easier to debug. That commit embraced this design, and excluded the test output from source control. However, we can do better. The XCTest `lit` tests produce test executables, which the test suite currently attempts to hide in a tmpdir somewhere. These executables are useful: it's nice to be able to re-run an executable at will. Change the location of the where the executables are generated. Instead of placing them in `%{built_tests_dir}`, place them in an output directory next to the test itself (a concept built into `lit` and provided by the `%T` substitution). Since we no longer use `%{built_tests_dir}`, remove it.
|
This change makes it much easier to see the test output. Now, instead of finding the tmpdir It's super handy! 💯 @swift-ci please test |
|
Tests pass! I think this is a big improvement. @mike-ferris-apple, @briancroom, please merge if you agree. :) |
|
I don't know much about lit, but the diff makes things look simpler... "T" isn't exactly as descriptive as the "{built_tests_dir}" it replaces, but it looks like you had to do custom stuff to get that defined while presumably T is a more standard lit thing... Seems like a good change. |
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.
When I first added functional tests in 589b23d, I struggled against
lit's design: I attempted to prevent test output from being generated alongside the tests themselves. It wasn't until 8181c16 that I saw the error of my ways:litplaces test output in the next to the tests in order to make them easier to debug. That commit embraced this design, and excluded the test output from source control.However, we can do better. The XCTest
littests produce test executables, which the test suite currently attempts to hide in a tmpdir somewhere. These executables are useful: it's nice to be able to re-run an executable at will.Change the location of the where the executables are generated. Instead of placing them in
%{built_tests_dir}, place them in an output directory next to the test itself (a concept built intolitand provided by the
%Tsubstitution). Since we no longer use%{built_tests_dir}, remove it./cc @ddunbar