From d259750511b3c2aaeace49f8ccb1d7f3ad561452 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 9 Dec 2021 15:47:34 +0300 Subject: Prepare for supporting multiple ids in requirement alternative --- tests/load/driver.cxx | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx index 25403c7..bc51c8d 100644 --- a/tests/load/driver.cxx +++ b/tests/load/driver.cxx @@ -30,11 +30,25 @@ using namespace butl; using namespace brep; using labels = small_vector; -using req_alts = small_vector; static const path packages ("packages.manifest"); static const path repositories ("repositories.manifest"); +static requirement_alternatives +req_alts (const strings& ras) +{ + requirement_alternatives r; + for (const string& s: ras) + { + requirement_alternative ra; + ra.push_back (s); + + r.push_back (move (ra)); + } + + return r; +} + static bool check_location (shared_ptr& p) { @@ -827,7 +841,7 @@ test_pkg_repos (const cstrings& loader_args, assert (fpvr5[3].conditional); assert (fpvr5[3].comment == "Only if using VC++ on Windows."); - assert (fpvr5[4][0] == "host"); + assert (fpvr5[4][0][0] == "host"); assert (check_location (fpv5)); -- cgit v1.1