RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 03:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32388 from wjwithagen/wjw-fix-boost_spirit-isblank-assert

Browse Source 
test: Do not test unicode if boost::spirit >= 1.72

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2019-12-23 00:40:31 +08:00 committed by GitHub
commit 70c29729f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/test/confutils.cc
View File

@ -231,6 +231,8 @@ const char illegal_conf4[] = "\
keyring = osd_keyring ; osd's keyring\n\ keyring = osd_keyring ; osd's keyring\n\
"; ";
#if BOOST_VERSION < 107200
// Boost::spirit > 1.72 asserts on chars that are not < 0x7f
// unicode config file // unicode config file
const char unicode_config_1[] = "\ const char unicode_config_1[] = "\
[global]\n\ [global]\n\
@ -238,6 +240,7 @@ const char unicode_config_1[] = "\
pid file = foo-bar\n\ pid file = foo-bar\n\
[osd0]\n\ [osd0]\n\
"; ";
#endif
const char override_config_1[] = "\ const char override_config_1[] = "\
[global]\n\ [global]\n\
@ -363,12 +366,14 @@ TEST(ConfUtils, ReadFiles2) {
ASSERT_EQ(cf1.read("global", "pid file", val), 0); ASSERT_EQ(cf1.read("global", "pid file", val), 0);
ASSERT_EQ(val, "spork"); ASSERT_EQ(val, "spork");
#if BOOST_VERSION < 107200
std::string unicode_config_1f(next_tempfile(unicode_config_1)); std::string unicode_config_1f(next_tempfile(unicode_config_1));
ConfFile cf2; ConfFile cf2;
ASSERT_EQ(cf2.parse_file(unicode_config_1f.c_str(), &err), 0); ASSERT_EQ(cf2.parse_file(unicode_config_1f.c_str(), &err), 0);
ASSERT_EQ(err.tellp(), 0U); ASSERT_EQ(err.tellp(), 0U);
ASSERT_EQ(cf2.read("global", "log file", val), 0); ASSERT_EQ(cf2.read("global", "log file", val), 0);
ASSERT_EQ(val, "\x66\xd1\x86\xd1\x9d\xd3\xad\xd3\xae"); ASSERT_EQ(val, "\x66\xd1\x86\xd1\x9d\xd3\xad\xd3\xae");
#endif
} }
TEST(ConfUtils, IllegalFiles) { TEST(ConfUtils, IllegalFiles) {