From a1520ce7f159397880f555139648f4e9999bc5bb Mon Sep 17 00:00:00 2001 From: Veloman Yunkan Date: Sun, 18 Apr 2021 00:05:08 +0400 Subject: [PATCH] Fixing the xenial build Under Ubuntu 16.04/xenial, ccache seems to have issues with multiline raw string literals used inside macros. --- test/server.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/test/server.cpp b/test/server.cpp index bcc2e7e05..5df6b6bbe 100644 --- a/test/server.cpp +++ b/test/server.cpp @@ -906,8 +906,7 @@ TEST_F(LibraryServerTest, catalog_v2_root) { const auto r = zfs1_->GET("/catalog/v2/root.xml"); EXPECT_EQ(r->status, 200); - EXPECT_EQ(maskVariableOPDSFeedData(r->body), -R"( + const char expected_output[] = R"( 12345678-90ab-cdef-1234-567890abcdef List of all categories in this catalog. -)" - ); +)"; + EXPECT_EQ(maskVariableOPDSFeedData(r->body), expected_output); } TEST_F(LibraryServerTest, catalog_v2_categories) { const auto r = zfs1_->GET("/catalog/v2/categories"); EXPECT_EQ(r->status, 200); - EXPECT_EQ(maskVariableOPDSFeedData(r->body), -R"( + const char expected_output[] = R"( 12345678-90ab-cdef-1234-567890abcdef All entries with category of 'wikipedia'. -)" - ); +)"; + EXPECT_EQ(maskVariableOPDSFeedData(r->body), expected_output); }