Fix several tests on Windows. #11048
Merged
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
Most of these were comparing paths using string comparison, which breaks when comparing Unix paths with Windows paths or comparing symlinks with realpaths.
ScottTodd
added
the
platform/windows 🚪
ScottTodd
requested review from
benvanik,
GMNGeoffrey,
antiagainst and
pzread
as code owners
ScottTodd
commented
Nov 4, 2022
Comment on lines
-52
to
-57
| self.assertEqual( | ||
| config, | ||
| BenchmarkConfig(root_benchmark_dir=os.path.join(self.build_dir.name, | ||
| "benchmark_suites"), | ||
| benchmark_results_dir=os.path.join( | ||
| per_commit_tmp_dir, "benchmark-results"), |
There was a problem hiding this comment.
This test got messy to update, since BenchmarkConfig calls os.path.realpath in many places.
This led to failures when comparing paths like
'C:\\Users\\runneradmin\\AppData\\Local\\Temp\\tmpm6qhk0oy\\benchmark_suites'
'C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\tmpm6qhk0oy\\benchmark_suites'
Could we just add a way to "assert equal, after canonicalizing all paths"?
There was a problem hiding this comment.
If we stored pathlib.Path objects instead of strings, the comparisons should be safer too.
There was a problem hiding this comment.
I'm fine with the current solution. We should refactor the tool to take pathlib.Path instead eventually. Can you file a bug?
benvanik
approved these changes
Nov 4, 2022
pzread
approved these changes
Nov 4, 2022
build_tools/python/e2e_test_artifacts/cmake_generator/iree_rule_generator.py
Outdated
Show resolved
Hide resolved
build_tools/python/e2e_test_artifacts/cmake_generator/iree_rule_generator_test.py
Outdated
Show resolved
Hide resolved
Comment on lines
-52
to
-57
| self.assertEqual( | ||
| config, | ||
| BenchmarkConfig(root_benchmark_dir=os.path.join(self.build_dir.name, | ||
| "benchmark_suites"), | ||
| benchmark_results_dir=os.path.join( | ||
| per_commit_tmp_dir, "benchmark-results"), |
There was a problem hiding this comment.
I'm fine with the current solution. We should refactor the tool to take pathlib.Path instead eventually. Can you file a bug?
ScottTodd
added a commit
that referenced
this pull request
Nov 7, 2022
…1032) Progress on #11009, depends on #11048 Changes: * `build_runtime` + `test_runtime` -> `build_test_runtime` (overhead from repository cloning, artifact upload, and artifact download was taking longer than just running the tests from the same job) * `build_runtime_windows` -> `build_test_runtime_windows` * Runs on `managed-windows-cpu` (larger build machine) * Runs tests, instead of just builds (now that all runtime tests pass on Windows) * Runs on presubmit now too, instead of just postsubmit (the build appears to be stable) Sample run: https://github.com/iree-org/iree/actions/runs/3412369869/jobs/5677798847
This was referenced Dec 9, 2022
This was referenced Dec 30, 2022
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.
Most of these were comparing paths using string comparison, which breaks when comparing Unix paths with Windows paths or comparing symlinks with realpaths.