From 7dbe375a2c270e91f9742dd78cf2b579d1f5f2fa Mon Sep 17 00:00:00 2001
From: Victor Romero <romerosanchezv@gmail.com>
Date: Thu, 11 Jul 2019 17:00:55 -0700
Subject: Testing for --overlay-ports and --overlay-triplets args (#7243)

---
 toolsrc/src/tests.plan.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'toolsrc/src/tests.plan.cpp')

diff --git a/toolsrc/src/tests.plan.cpp b/toolsrc/src/tests.plan.cpp
index ab24266b4..9d8717878 100644
--- a/toolsrc/src/tests.plan.cpp
+++ b/toolsrc/src/tests.plan.cpp
@@ -89,14 +89,15 @@ namespace UnitTest1
                             const std::vector<std::pair<const char*, const char*>>& features = {},
                             const std::vector<const char*>& default_features = {})
         {
-            return emplace(std::move(*make_control_file(name, depends, features, default_features)));
+            auto scfl = SourceControlFileLocation { make_control_file(name, depends, features, default_features), "" };
+            return emplace(std::move(scfl));
         }
-        PackageSpec emplace(vcpkg::SourceControlFile&& scf)
+
+        PackageSpec emplace(vcpkg::SourceControlFileLocation&& scfl)
         {
-            auto spec = PackageSpec::from_name_and_triplet(scf.core_paragraph->name, triplet);
+            auto spec = PackageSpec::from_name_and_triplet(scfl.source_control_file->core_paragraph->name, triplet);
             Assert::IsTrue(spec.has_value());
-            map.emplace(scf.core_paragraph->name,
-                        SourceControlFileLocation{std::unique_ptr<SourceControlFile>(std::move(&scf)), ""});
+            map.emplace(scfl.source_control_file->core_paragraph->name, std::move(scfl));
             return PackageSpec{*spec.get()};
         }
     };
-- 
cgit v1.2.3