The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[vcpkg] Fix "[commands-build] build smoke test" (#12128)

Browse Source 
* [vcpkg] Fix "[commands-build] build smoke test"

1. Do not exit with a success code in Build::perform, because this causes failures in other tests to be ignored.
2. Use temp directory to avoid interference with the current set of {installed, buildtrees, packages}
3. Explicitly disable binary caching

* [vcpkg] Disable binarycaching in "build smoke test", "[commands-build]"

Return 1 for the last failure case in Build::perform() so testing may continue.

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
This commit is contained in:
ras0219 2020-06-26 11:35:41 -07:00 committed by GitHub
parent 4c527e49c4
commit 7ebb42a4d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
toolsrc/src/vcpkg-test/commands.build.cpp
View File

@ -6,15 +6,27 @@
#include <vcpkg/commands.h>
#include <vcpkg/vcpkgcmdarguments.h>
#include <vcpkg/vcpkgpaths.h>
#include <vcpkg-test/util.h>
using namespace vcpkg;
TEST_CASE ("build smoke test", "[commands-build]")
{
using namespace vcpkg;
static const std::string args_raw[] = {"build", "zlib"};
auto& fs_wrapper = Files::get_real_filesystem();
VcpkgCmdArguments args = VcpkgCmdArguments::create_from_arg_sequence(std::begin(args_raw), std::end(args_raw));
args.binary_caching = false;
args.buildtrees_root_dir =
std::make_unique<std::string>((Test::base_temporary_directory() / fs::u8path("buildtrees")).u8string());
args.install_root_dir =
std::make_unique<std::string>((Test::base_temporary_directory() / fs::u8path("installed")).u8string());
args.packages_root_dir =
std::make_unique<std::string>((Test::base_temporary_directory() / fs::u8path("packages")).u8string());
VcpkgPaths paths(fs_wrapper, args);
if (fs_wrapper.exists(paths.buildtrees)) fs_wrapper.remove_all_inside(paths.buildtrees, VCPKG_LINE_INFO);
if (fs_wrapper.exists(paths.packages)) fs_wrapper.remove_all_inside(paths.packages, VCPKG_LINE_INFO);
if (fs_wrapper.exists(paths.installed)) fs_wrapper.remove_all_inside(paths.installed, VCPKG_LINE_INFO);
auto triplet = default_triplet(args);
const auto exit_code = Build::Command::perform(args, paths, triplet);
REQUIRE(exit_code == 0);

7
toolsrc/src/vcpkg-test/util.cpp
View File

@ -155,9 +155,12 @@ namespace vcpkg::Test
#endif
}
const static fs::path BASE_TEMPORARY_DIRECTORY = internal_base_temporary_directory();
const fs::path& base_temporary_directory() noexcept { return BASE_TEMPORARY_DIRECTORY; }
const fs::path& base_temporary_directory() noexcept
{
const static fs::path BASE_TEMPORARY_DIRECTORY = internal_base_temporary_directory();
return BASE_TEMPORARY_DIRECTORY;
}
#if FILESYSTEM_SYMLINK == FILESYSTEM_SYMLINK_NONE
constexpr char no_filesystem_message[] =

4
toolsrc/src/vcpkg/build.cpp
View File

@ -140,10 +140,10 @@ namespace vcpkg::Build
{
System::print2(System::Color::error, Build::create_error_message(result.code, spec), '\n');
System::print2(Build::create_user_troubleshooting_message(spec), '\n');
Checks::exit_fail(VCPKG_LINE_INFO);
return 1;
}
Checks::exit_success(VCPKG_LINE_INFO);
return 0;
}
int Command::perform(const VcpkgCmdArguments& args, const VcpkgPaths& paths, Triplet default_triplet)