andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disable OptionsParserTest.BlockBasedTableOptionsAllFieldsSettable under CLANG

Browse Source 
Summary: OptionsParserTest.BlockBasedTableOptionsAllFieldsSettable is failiong under CLANG. Disable the test to unblock the build.

Test Plan: Run it both of CLANG and GCC

Reviewers: kradhakrishnan, rven, andrewkr, anthony, yhchiang, IslamAbdelRahman

Reviewed By: IslamAbdelRahman

Subscribers: leveldb, dhruba

Differential Revision: https://reviews.facebook.net/D53157
This commit is contained in:
sdong 2016-01-21 10:52:38 -08:00
parent a300d9928e
commit 2c2b72218d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/options_test.cc
View File

@ -1478,6 +1478,7 @@ TEST_F(OptionsParserTest, EscapeOptionString) {
// Only run OptionsParserTest.BlockBasedTableOptionsAdded on limited platforms // Only run OptionsParserTest.BlockBasedTableOptionsAdded on limited platforms
// as it depends on behavior of compilers. // as it depends on behavior of compilers.
#ifdef OS_LINUX #ifdef OS_LINUX
#ifndef __clang__
const char kSpecialChar = 'R'; const char kSpecialChar = 'R';
// Items in the form of <offset, size>. Need to be in ascending order // Items in the form of <offset, size>. Need to be in ascending order
// and not overlapping. Need to updated if new pointer-option is added. // and not overlapping. Need to updated if new pointer-option is added.
@ -1493,7 +1494,7 @@ const std::vector<std::pair<int, size_t>> kBbtoBlacklist = {
}; };
void FillWithSpecialChar(char* start_ptr) { void FillWithSpecialChar(char* start_ptr) {
int offset = 0; size_t offset = 0;
for (auto& pair : kBbtoBlacklist) { for (auto& pair : kBbtoBlacklist) {
std::memset(start_ptr + offset, kSpecialChar, pair.first - offset); std::memset(start_ptr + offset, kSpecialChar, pair.first - offset);
offset = pair.first + pair.second; offset = pair.first + pair.second;
@ -1505,7 +1506,7 @@ void FillWithSpecialChar(char* start_ptr) {
int NumUnsetBytes(char* start_ptr) { int NumUnsetBytes(char* start_ptr) {
int total_unset_bytes_base = 0; int total_unset_bytes_base = 0;
int offset = 0; size_t offset = 0;
for (auto& pair : kBbtoBlacklist) { for (auto& pair : kBbtoBlacklist) {
for (char* ptr = start_ptr + offset; ptr < start_ptr + pair.first; ptr++) { for (char* ptr = start_ptr + offset; ptr < start_ptr + pair.first; ptr++) {
if (*ptr == kSpecialChar) { if (*ptr == kSpecialChar) {
@ -1580,6 +1581,7 @@ TEST_F(OptionsParserTest, BlockBasedTableOptionsAllFieldsSettable) {
delete[] bbto_ptr; delete[] bbto_ptr;
delete[] new_bbto_ptr; delete[] new_bbto_ptr;
} }
#endif // !__clang__
#endif // OS_LINUX #endif // OS_LINUX
#endif // !ROCKSDB_LITE #endif // !ROCKSDB_LITE