Skip to content

Fix memory leak in test #18622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luotao1 merged 4 commits into from
Aug 2, 2019
Merged

Fix memory leak in test #18622

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6fbdda2
Fix memory leak in test
kbinias Jul 12, 2019
add1984
Fix memory leak in test
kbinias Jul 29, 2019
c6f2858
Fix memory leak in test
kbinias Jul 30, 2019
9369f49
Pull out vars of the loops
kbinias Aug 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions paddle/testing/paddle_gtest_main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,29 +61,39 @@ int main(int argc, char** argv) {
undefok.push_back("initial_cpu_memory_in_mb");
#endif

char* env_str = nullptr;
if (envs.size() > 0) {
std::string env_string = "--tryfromenv=";
for (auto t : envs) {
env_string += t + ",";
}
env_string = env_string.substr(0, env_string.length() - 1);
new_argv.push_back(strdup(env_string.c_str()));
env_str = strdup(env_string.c_str());
new_argv.push_back(env_str);
VLOG(1) << "gtest env_string:" << env_string;
}

char* undefok_str = nullptr;
if (undefok.size() > 0) {
std::string undefok_string = "--undefok=";
for (auto t : undefok) {
undefok_string += t + ",";
}
undefok_string = undefok_string.substr(0, undefok_string.length() - 1);
new_argv.push_back(strdup(undefok_string.c_str()));
undefok_str = strdup(undefok_string.c_str());
new_argv.push_back(undefok_str);
VLOG(1) << "gtest undefok_string:" << undefok_string;
}

int new_argc = static_cast<int>(new_argv.size());
char** new_argv_address = new_argv.data();
google::ParseCommandLineFlags(&new_argc, &new_argv_address, false);
paddle::framework::InitDevices(true);
return RUN_ALL_TESTS();

int ret = RUN_ALL_TESTS();

if (env_str) free(env_str);
if (undefok_str) free(undefok_str);

return ret;
}