aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/vcpkg-test/paragraph.cpp
diff options
context:
space:
mode:
authornicole mazzuca <mazzucan@outlook.com>2020-08-02 10:08:07 -0700
committerGitHub <noreply@github.com>2020-08-02 10:08:07 -0700
commit1c2af994151fb3e177df54f89223b056ecddbcec (patch)
tree263cdf1db448c2a0610191922c7c6036c4a4b366 /toolsrc/src/vcpkg-test/paragraph.cpp
parentc0f23c6c31ea7af5a751ea48a043dc64a872f4a0 (diff)
downloadvcpkg-1c2af994151fb3e177df54f89223b056ecddbcec.tar.gz
vcpkg-1c2af994151fb3e177df54f89223b056ecddbcec.zip
[vcpkg format-manifest] Add convert-control flag (#12471)
* [vcpkg format-manifest] initial convert-control attempt TODO: manifest comments! we should keep $directives * Finalize x-format-manifest First, fix Json::parse -- "\c", for any c, was incorrectly parsed. It would emit the escaped character, and then parse the character, so that `\b` would give you { '\b', 'b' }. Second, canonicalize source paragraphs as we're parsing them. This found an error in qt5 -- The `declarative` feature was listed twice, and we now catch it, so I removed the second paragraph. Add PlatformExpression::complexity to allow ordering platform expressions in a somewhat reasonable way. Notes: - We allow `all_modules` as a feature name for back-compat with paraview - In order to actually convert CONTROL to vcpkg.json, we'd need to rename the qt5 `default` feature. - We need to add support for $directives in x-format-manifest * fix qt5 port * format * fix compile * fix tests for canonicalization * Clean up code * add error message for nothing to format * add extra_info field * add `const X&` overloads for `Object::insert[_or_replace]` * fix compile * simple CRs * add tests * format * Fix mosquitto port file also unmerge a line * fail the tests on malformed manifest * fix format_all * fix coroutine port-version * format manifests
Diffstat (limited to 'toolsrc/src/vcpkg-test/paragraph.cpp')
-rw-r--r--toolsrc/src/vcpkg-test/paragraph.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/toolsrc/src/vcpkg-test/paragraph.cpp b/toolsrc/src/vcpkg-test/paragraph.cpp
index 2638a3900..05ba8cfba 100644
--- a/toolsrc/src/vcpkg-test/paragraph.cpp
+++ b/toolsrc/src/vcpkg-test/paragraph.cpp
@@ -87,8 +87,9 @@ TEST_CASE ("SourceParagraph two dependencies", "[paragraph]")
auto& pgh = **m_pgh.get();
REQUIRE(pgh.core_paragraph->dependencies.size() == 2);
- REQUIRE(pgh.core_paragraph->dependencies[0].name == "z");
- REQUIRE(pgh.core_paragraph->dependencies[1].name == "openssl");
+ // should be ordered
+ REQUIRE(pgh.core_paragraph->dependencies[0].name == "openssl");
+ REQUIRE(pgh.core_paragraph->dependencies[1].name == "z");
}
TEST_CASE ("SourceParagraph three dependencies", "[paragraph]")
@@ -102,9 +103,10 @@ TEST_CASE ("SourceParagraph three dependencies", "[paragraph]")
auto& pgh = **m_pgh.get();
REQUIRE(pgh.core_paragraph->dependencies.size() == 3);
- REQUIRE(pgh.core_paragraph->dependencies[0].name == "z");
- REQUIRE(pgh.core_paragraph->dependencies[1].name == "openssl");
- REQUIRE(pgh.core_paragraph->dependencies[2].name == "xyz");
+ // should be ordered
+ REQUIRE(pgh.core_paragraph->dependencies[0].name == "openssl");
+ REQUIRE(pgh.core_paragraph->dependencies[1].name == "xyz");
+ REQUIRE(pgh.core_paragraph->dependencies[2].name == "z");
}
TEST_CASE ("SourceParagraph construct qualified dependencies", "[paragraph]")