clang-format: re-format for clang-18
clang-format-18 isn't compatible with the clang-format-17 output, so we
need to reformat the code with the latest version. The way clang-18
handles lambda formatting also changed, so we have made changes to the
organization default style format to better handle lambda formatting.
See I5e08687e696dd240402a2780158664b7113def0e for updated style.
See Iea0776aaa7edd483fa395e23de25ebf5a6288f71 for clang-18 enablement.
Change-Id: Id6c141dd4eba2423f476499b999aec9cb42f6192
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/test/test_signature.cpp b/test/test_signature.cpp
index 0af5500..26e71d7 100644
--- a/test/test_signature.cpp
+++ b/test/test_signature.cpp
@@ -71,8 +71,8 @@
command("openssl rsa -in " + pkeyFile + " -outform PEM " +
"-pubout -out " + pubkeyFile);
- std::string pubKeyConfFile = signedConfPNORPath.string() + "/" +
- "publickey";
+ std::string pubKeyConfFile =
+ signedConfPNORPath.string() + "/" + "publickey";
command("cp " + pubkeyFile + " " + signedConfPNORPath.string());
command(opensslCmd + pkeyFile + " -out " + pnorFile + ".sig " +
pnorFile);
diff --git a/test/test_version.cpp b/test/test_version.cpp
index 448d95e..1e60ab8 100644
--- a/test/test_version.cpp
+++ b/test/test_version.cpp
@@ -48,18 +48,19 @@
"\tsbe-cf61dc3\n"
"\thcode-hw123119a.930";
- const auto& [version,
- extendedVersion] = Version::getVersions(versionString);
+ const auto& [version, extendedVersion] =
+ Version::getVersions(versionString);
EXPECT_EQ(version, "open-power-romulus-v2.2-rc1-48-g268344f-dirty");
- EXPECT_EQ(extendedVersion, "buildroot-2018.11.1-7-g5d7cc8c,"
- "skiboot-v6.2,"
- "hostboot-3f1f218-pea87ca7,"
- "occ-12c8088,"
- "linux-4.19.13-openpower1-p8031295,"
- "petitboot-1.9.2,"
- "machine-xml-7410460,"
- "hostboot-binaries-hw121518a.930,"
- "capp-ucode-p9-dd2-v4,"
- "sbe-cf61dc3,"
- "hcode-hw123119a.930");
+ EXPECT_EQ(extendedVersion,
+ "buildroot-2018.11.1-7-g5d7cc8c,"
+ "skiboot-v6.2,"
+ "hostboot-3f1f218-pea87ca7,"
+ "occ-12c8088,"
+ "linux-4.19.13-openpower1-p8031295,"
+ "petitboot-1.9.2,"
+ "machine-xml-7410460,"
+ "hostboot-binaries-hw121518a.930,"
+ "capp-ucode-p9-dd2-v4,"
+ "sbe-cf61dc3,"
+ "hcode-hw123119a.930");
}