[vcpkg] Refactor end-to-end tests#15081
Merged
ras0219-msft merged 3 commits intomicrosoft:masterfrom Dec 15, 2020
Merged
Conversation
ras0219
force-pushed
the
dev/roschuma/e2e-refactor
branch
from
0ce2674 to
de8c7b9
Compare
BillyONeal
requested changes
Dec 14, 2020
ras0219
force-pushed
the
dev/roschuma/e2e-refactor
branch
from
fcf964d to
52d2652
Compare
BillyONeal
approved these changes
Dec 14, 2020
strega-nil
suggested changes
Dec 14, 2020
| # Test msbuild props and targets | ||
| $CurrentTest = "zlib:x86-windows-static msbuild scripts\testing\integrate-install\..." | ||
| Write-Host $CurrentTest | ||
| ./vcpkg $commonArgs install zlib:x86-windows-static --x-binarysource=clear |
Contributor
There was a problem hiding this comment.
Suggested change
| ./vcpkg $commonArgs install zlib:x86-windows-static --x-binarysource=clear | |
| Run-Vcpkg @commonArgs install zlib:x86-windows-static --x-binarysource=clear |
| } | ||
| $CurrentTest = "zlib:x86-windows msbuild scripts\testing\integrate-install\..." | ||
| Write-Host $CurrentTest | ||
| ./vcpkg $commonArgs install zlib:x86-windows --x-binarysource=clear |
Contributor
There was a problem hiding this comment.
Suggested change
| ./vcpkg $commonArgs install zlib:x86-windows --x-binarysource=clear | |
| Run-Vcpkg @commonArgs install zlib:x86-windows --x-binarysource=clear |
| foreach ($project in @("Project1", "NoProps")) { | ||
| $CurrentTest = "msbuild scripts\testing\integrate-install\$project.vcxproj" | ||
| Write-Host $CurrentTest | ||
| ./vcpkg $commonArgs env "msbuild scripts\testing\integrate-install\$project.vcxproj /p:VcpkgRoot=$TestingRoot /p:IntDir=$TestingRoot\int\ /p:OutDir=$TestingRoot\out\ " |
Contributor
There was a problem hiding this comment.
Suggested change
| ./vcpkg $commonArgs env "msbuild scripts\testing\integrate-install\$project.vcxproj /p:VcpkgRoot=$TestingRoot /p:IntDir=$TestingRoot\int\ /p:OutDir=$TestingRoot\out\ " | |
| Run-Vcpkg @commonArgs env "msbuild scripts\testing\integrate-install\$project.vcxproj /p:VcpkgRoot=$TestingRoot /p:IntDir=$TestingRoot\int\ /p:OutDir=$TestingRoot\out\ " |
| process_output_directory(filesystem, root, args.packages_root_dir.get(), "packages", VCPKG_LINE_INFO); | ||
| scripts = process_input_directory(filesystem, root, args.scripts_root_dir.get(), "scripts", VCPKG_LINE_INFO); | ||
| builtin_ports = | ||
| process_output_directory(filesystem, root, args.builtin_ports_root_dir.get(), "ports", VCPKG_LINE_INFO); |
Contributor
There was a problem hiding this comment.
Suggested change
| process_output_directory(filesystem, root, args.builtin_ports_root_dir.get(), "ports", VCPKG_LINE_INFO); | |
| process_input_directory(filesystem, root, args.builtin_ports_root_dir.get(), "ports", VCPKG_LINE_INFO); |
this should be an input directory, no?
Contributor
Author
There was a problem hiding this comment.
It's complicated, because it's an output directory for create.
Contributor
Author
|
@strega-nil This PR is scoped to just split the tests as-is into separate files to unblock adding tests for all other outstanding feature PRs. It is not intended to have any functional changes (except moving the create test). I'll leave further test cleanup to future work. |
Contributor
|
@ras0219 mmh, alright. |
strega-nil
pushed a commit
to strega-nil/vcpkg
that referenced
this pull request
May 5, 2021
* [vcpkg] Refactor end-to-end tests * [vcpkg] Cherry-pick x-builtin-ports-root from microsoft#14999 * [vcpkg] Move create test from unit tests to e2e Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
This PR splits the end to end integration tests into separate files so they can be individually tested:
Each suite begins by sourcing the prelude file, which resets the WorkingRoot to a known good state.