mirror of https://github.com/kiwix/libkiwix.git
Fixing the xenial build
Under Ubuntu 16.04/xenial, ccache seems to have issues with multiline raw string literals used inside macros.
This commit is contained in:
parent
2e53b51696
commit
a1520ce7f1
|
@ -906,8 +906,7 @@ TEST_F(LibraryServerTest, catalog_v2_root)
|
||||||
{
|
{
|
||||||
const auto r = zfs1_->GET("/catalog/v2/root.xml");
|
const auto r = zfs1_->GET("/catalog/v2/root.xml");
|
||||||
EXPECT_EQ(r->status, 200);
|
EXPECT_EQ(r->status, 200);
|
||||||
EXPECT_EQ(maskVariableOPDSFeedData(r->body),
|
const char expected_output[] = R"(<?xml version="1.0" encoding="UTF-8"?>
|
||||||
R"(<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<feed xmlns="http://www.w3.org/2005/Atom">
|
<feed xmlns="http://www.w3.org/2005/Atom">
|
||||||
<id>12345678-90ab-cdef-1234-567890abcdef</id>
|
<id>12345678-90ab-cdef-1234-567890abcdef</id>
|
||||||
<link rel="self"
|
<link rel="self"
|
||||||
|
@ -938,16 +937,15 @@ R"(<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<content type="text">List of all categories in this catalog.</content>
|
<content type="text">List of all categories in this catalog.</content>
|
||||||
</entry>
|
</entry>
|
||||||
</feed>
|
</feed>
|
||||||
)"
|
)";
|
||||||
);
|
EXPECT_EQ(maskVariableOPDSFeedData(r->body), expected_output);
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_F(LibraryServerTest, catalog_v2_categories)
|
TEST_F(LibraryServerTest, catalog_v2_categories)
|
||||||
{
|
{
|
||||||
const auto r = zfs1_->GET("/catalog/v2/categories");
|
const auto r = zfs1_->GET("/catalog/v2/categories");
|
||||||
EXPECT_EQ(r->status, 200);
|
EXPECT_EQ(r->status, 200);
|
||||||
EXPECT_EQ(maskVariableOPDSFeedData(r->body),
|
const char expected_output[] = R"(<?xml version="1.0" encoding="UTF-8"?>
|
||||||
R"(<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<feed xmlns="http://www.w3.org/2005/Atom">
|
<feed xmlns="http://www.w3.org/2005/Atom">
|
||||||
<id>12345678-90ab-cdef-1234-567890abcdef</id>
|
<id>12345678-90ab-cdef-1234-567890abcdef</id>
|
||||||
<link rel="self"
|
<link rel="self"
|
||||||
|
@ -978,6 +976,6 @@ R"(<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<content type="text">All entries with category of 'wikipedia'.</content>
|
<content type="text">All entries with category of 'wikipedia'.</content>
|
||||||
</entry>
|
</entry>
|
||||||
</feed>
|
</feed>
|
||||||
)"
|
)";
|
||||||
);
|
EXPECT_EQ(maskVariableOPDSFeedData(r->body), expected_output);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue