Fix Robert clean-after-build PR feedback
ADD
azure-pipelines/e2e_ports/overlays/vcpkg-clean-after-build-test-port/portfile.cmake
+file(WRITE "${DOWNLOADS}/clean_after_build_test.txt" "some downloaded content")
+file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src")
+file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/some_sources")
+file(WRITE "${CURRENT_BUILDTREES_DIR}/src/some_sources/source.c" "some sources content")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include")
+file(WRITE "${CURRENT_PACKAGES_DIR}/include/vcpkg-clean-after-build-test-port.h" "some header content")
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "some license content")

ADD
azure-pipelines/e2e_ports/overlays/vcpkg-clean-after-build-test-port/vcpkg.json
+{
+ "name": "vcpkg-clean-after-build-test-port",
+ "version-date": "2021-05-05"
+}

MODIFY
azure-pipelines/end-to-end-tests-dir/clean-after-build.ps1
azure-pipelines/end-to-end-tests-dir/clean-after-build.ps1
. $PSScriptRoot/../end-to-end-tests-prelude.ps1
+$downloadsRoot = Join-Path $TestingRoot 'downloads'
+
$CurrentTest = "Clean After Build"
-$ZlibInstalledHeader = Join-Path $installRoot "$Triplet/include/zlib.h"
-$ZlibDownloadTarball = Join-Path $downloadsRoot 'zlib1211.tar.gz'
-$ZlibPackageRoot = Join-Path $packagesRoot "zlib_$Triplet"
-$ZlibSrc = Join-Path $buildtreesRoot "zlib/src"
+$InstalledHeader = Join-Path $installRoot "$Triplet/include/vcpkg-clean-after-build-test-port.h"
+$DownloadedFile = Join-Path $downloadsRoot 'clean_after_build_test.txt'
+$PackageRoot = Join-Path $packagesRoot "vcpkg-clean-after-build-test-port_$Triplet"
+$PackageSrc = Join-Path $buildtreesRoot "vcpkg-clean-after-build-test-port/src"
-$installZlibArgs = @("install", "zlib", "--no-binarycaching")
+$installTestPortArgs = `
+ @("install", "vcpkg-clean-after-build-test-port", "--no-binarycaching", "--downloads-root=$downloadsRoot")
Refresh-TestRoot
-Run-Vcpkg -TestArgs ($commonArgs + $installZlibArgs)
-Require-FileExists $ZlibInstalledHeader
-Require-FileExists $ZlibDownloadTarball
-Require-FileExists $ZlibPackageRoot
-Require-FileExists $ZlibSrc
+Run-Vcpkg -TestArgs ($commonArgs + $installTestPortArgs)
+Require-FileExists $InstalledHeader
+Require-FileExists $DownloadedFile
+Require-FileExists $PackageRoot
+Require-FileExists $PackageSrc
Refresh-TestRoot
-Run-Vcpkg -TestArgs ($commonArgs + $installZlibArgs + @("--clean-packages-after-build"))
-Require-FileExists $ZlibInstalledHeader
-Require-FileExists $ZlibDownloadTarball
-Require-FileNotExists $ZlibPackageRoot
-Require-FileExists $ZlibSrc
+Run-Vcpkg -TestArgs ($commonArgs + $installTestPortArgs + @("--clean-packages-after-build"))
+Require-FileExists $InstalledHeader
+Require-FileExists $DownloadedFile
+Require-FileNotExists $PackageRoot
+Require-FileExists $PackageSrc
Refresh-TestRoot
-Run-Vcpkg -TestArgs ($commonArgs + $installZlibArgs + @("--clean-buildtrees-after-build"))
-Require-FileExists $ZlibInstalledHeader
-Require-FileExists $ZlibDownloadTarball
-Require-FileExists $ZlibPackageRoot
-Require-FileNotExists $ZlibSrc
+Run-Vcpkg -TestArgs ($commonArgs + $installTestPortArgs + @("--clean-buildtrees-after-build"))
+Require-FileExists $InstalledHeader
+Require-FileExists $DownloadedFile
+Require-FileExists $PackageRoot
+Require-FileNotExists $PackageSrc
Refresh-TestRoot
-Run-Vcpkg -TestArgs ($commonArgs + $installZlibArgs + @("--clean-packages-after-build", "--clean-buildtrees-after-build"))
-Require-FileExists $ZlibInstalledHeader
-Require-FileExists $ZlibDownloadTarball
-Require-FileNotExists $ZlibPackageRoot
-Require-FileNotExists $ZlibSrc
+Run-Vcpkg -TestArgs ($commonArgs + $installTestPortArgs + @(
+ "--clean-packages-after-build",
+ "--clean-buildtrees-after-build"
+ ))
+Require-FileExists $InstalledHeader
+Require-FileExists $DownloadedFile
+Require-FileNotExists $PackageRoot
+Require-FileNotExists $PackageSrc
Refresh-TestRoot
-Run-Vcpkg -TestArgs ($commonArgs + $installZlibArgs + @("--clean-buildtrees-after-build"))
-Require-FileExists $ZlibInstalledHeader
-Require-FileExists $ZlibDownloadTarball
-Require-FileExists $ZlibPackageRoot
-Require-FileNotExists $ZlibSrc
+Run-Vcpkg -TestArgs ($commonArgs + $installTestPortArgs + @("--clean-buildtrees-after-build"))
+Require-FileExists $InstalledHeader
+Require-FileExists $DownloadedFile
+Require-FileExists $PackageRoot
+Require-FileNotExists $PackageSrc
Refresh-TestRoot
-Run-Vcpkg -TestArgs ($commonArgs + $installZlibArgs + @("--clean-downloads-after-build", "--clean-packages-after-build", "--clean-buildtrees-after-build"))
-Require-FileExists $ZlibInstalledHeader
-Require-FileNotExists $ZlibDownloadTarball
-Require-FileNotExists $ZlibPackageRoot
-Require-FileNotExists $ZlibSrc
+Run-Vcpkg -TestArgs ($commonArgs + $installTestPortArgs + @(
+ "--clean-downloads-after-build",
+ "--clean-packages-after-build",
+ "--clean-buildtrees-after-build"
+ ))
+Require-FileExists $InstalledHeader
+Require-FileNotExists $DownloadedFile
+Require-FileNotExists $PackageRoot
+Require-FileNotExists $PackageSrc
Refresh-TestRoot
-Run-Vcpkg -TestArgs ($commonArgs + $installZlibArgs + @("--clean-after-build"))
-Require-FileExists $ZlibInstalledHeader
-Require-FileNotExists $ZlibDownloadTarball
-Require-FileNotExists $ZlibPackageRoot
-Require-FileNotExists $ZlibSrc
+Run-Vcpkg -TestArgs ($commonArgs + $installTestPortArgs + @("--clean-after-build"))
+Require-FileExists $InstalledHeader
+Require-FileNotExists $DownloadedFile
+Require-FileNotExists $PackageRoot
+Require-FileNotExists $PackageSrc
Refresh-TestRoot
-Run-Vcpkg -TestArgs ($commonArgs + $installZlibArgs + @("--clean-after-build", "--clean-downloads-after-build", "--clean-packages-after-build", "--clean-buildtrees-after-build"))
-Require-FileExists $ZlibInstalledHeader
-Require-FileNotExists $ZlibDownloadTarball
-Require-FileNotExists $ZlibPackageRoot
-Require-FileNotExists $ZlibSrc
+Run-Vcpkg -TestArgs ($commonArgs + $installTestPortArgs + @(
+ "--clean-after-build",
+ "--clean-downloads-after-build",
+ "--clean-packages-after-build",
+ "--clean-buildtrees-after-build"
+ ))
+Require-FileExists $InstalledHeader
+Require-FileNotExists $DownloadedFile
+Require-FileNotExists $PackageRoot
+Require-FileNotExists $PackageSrc

MODIFY
azure-pipelines/end-to-end-tests-prelude.ps1
azure-pipelines/end-to-end-tests-prelude.ps1
@@ -2,7 +2,6 @@ $TestingRoot = Join-Path $WorkingRoot 'testing'
$buildtreesRoot = Join-Path $TestingRoot 'buildtrees'
$installRoot = Join-Path $TestingRoot 'installed'
$packagesRoot = Join-Path $TestingRoot 'packages'
-$downloadsRoot = Join-Path $TestingRoot 'downloads'
$NuGetRoot = Join-Path $TestingRoot 'nuget'
$NuGetRoot2 = Join-Path $TestingRoot 'nuget2'
$ArchiveRoot = Join-Path $TestingRoot 'archives'
@@ -13,7 +12,6 @@ $commonArgs = @(
"--x-buildtrees-root=$buildtreesRoot",
"--x-install-root=$installRoot",
"--x-packages-root=$packagesRoot",
- "--downloads-root=$downloadsRoot",
"--overlay-ports=$PSScriptRoot/e2e_ports/overlays",
"--overlay-triplets=$PSScriptRoot/e2e_ports/triplets"
)

Fix Robert clean-after-build PR feedback (#73)