RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 18:21:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug: When run Test_filejournal testcase with gtest argument, all of testcases is failed.

Browse Source 
when run testcase with gtest argument, for example, with argument --gtest_output=xml:/root/reports/ceph_test_cls_version.xml,
then the test result is failed, because of the test program use the first argument as the journal file name.
Signed-off-by: shanggao qiu <qiushanggao@qq.com>
This commit is contained in:
qiushanggao 2015-01-20 10:27:50 +08:00
parent 6fd348fe43
commit d3fc5bd803
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/test/test_filejournal.cc
View File

@ -56,6 +56,8 @@ public:
};
unsigned size_mb = 200;
//Gtest argument prefix
const char GTEST_PRFIX[] = "--gtest_";
int main(int argc, char **argv) {
vector<const char*> args;
@ -71,13 +73,21 @@ int main(int argc, char **argv) {
finisher = new Finisher(g_ceph_context);
path[0] = '\0';
if (!args.empty()) {
size_t copy_len = std::min(sizeof(path)-1, strlen(args[0]));
strncpy(path, args[0], copy_len);
path[copy_len] = '\0';
} else {
srand(getpid()+time(0));
snprintf(path, sizeof(path), "/tmp/ceph_test_filejournal.tmp.%d", rand());
for ( unsigned int i = 0; i < args.size(); ++i) {
if (strncmp(args[i], GTEST_PRFIX, sizeof(GTEST_PRFIX) - 1)) {
//Non gtest argument, set to path.
size_t copy_len = std::min(sizeof(path) - 1, strlen(args[i]));
strncpy(path, args[i], copy_len);
path[copy_len] = '\0';
break;
}
}
}
if ( path[0] == '\0') {
srand(getpid() + time(0));
snprintf(path, sizeof(path), "/var/tmp/ceph_test_filejournal.tmp.%d", rand());
}
cout << "path " << path << std::endl;