aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/vcpkg-test
diff options
context:
space:
mode:
authorras0219 <533828+ras0219@users.noreply.github.com>2021-01-22 12:26:01 -0800
committerGitHub <noreply@github.com>2021-01-22 12:26:01 -0800
commit3b433e5081f35a32331492d98a8b0c1c2477048e (patch)
tree46757161cc74030197cb40ee22d9fa5efa4bbb6f /toolsrc/src/vcpkg-test
parent0e4d6f084f95584b7fc7460509821115f1868d30 (diff)
downloadvcpkg-3b433e5081f35a32331492d98a8b0c1c2477048e.tar.gz
vcpkg-3b433e5081f35a32331492d98a8b0c1c2477048e.zip
[vcpkg] Fix regression in error messages with registries/versioning (#15709)
* [vcpkg] Fix regression in error messages with registries/versioning * [vcpkg] Clean up redundant re-parsing with try_load_overlay_port * [vcpkg] Deduplicate PathsPortfileProvider * [vcpkg] Restore uses of Checks::exit_maybe_upgrade after merge
Diffstat (limited to 'toolsrc/src/vcpkg-test')
-rw-r--r--toolsrc/src/vcpkg-test/dependencies.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/toolsrc/src/vcpkg-test/dependencies.cpp b/toolsrc/src/vcpkg-test/dependencies.cpp
index 8f936abc3..c6241ebe0 100644
--- a/toolsrc/src/vcpkg-test/dependencies.cpp
+++ b/toolsrc/src/vcpkg-test/dependencies.cpp
@@ -78,6 +78,11 @@ struct MockVersionedPortfileProvider : PortFileProvider::IVersionedPortfileProvi
}
return it2->second;
}
+
+ virtual void load_all_control_files(std::map<std::string, const SourceControlFileLocation*>&) const override
+ {
+ Checks::unreachable(VCPKG_LINE_INFO);
+ }
};
using Versions::Constraint;
@@ -190,6 +195,11 @@ struct MockOverlayProvider : PortFileProvider::IOverlayProvider, Util::ResourceB
return it->second;
}
+ virtual void load_all_control_files(std::map<std::string, const SourceControlFileLocation*>&) const override
+ {
+ Checks::unreachable(VCPKG_LINE_INFO);
+ }
+
private:
std::map<std::string, SourceControlFileLocation, std::less<>> mappings;
};