generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am da73dac7: am bda85a12: Merge "Add path separator in bionic-unit-tests program path."

Browse Source 
* commit 'da73dac7acce09b76bd6d811c8be694e69acbd17':
  Add path separator in bionic-unit-tests program path.
This commit is contained in:
Yabin Cui
2015-02-05 22:08:49 +00:00
committed by Android Git Automerger
parent ec56d962ad da73dac7ac
commit b69e9f1fe1
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/gtest_main.cpp
View File

@@ -16,9 +16,11 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <ctype.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <inttypes.h> #include <inttypes.h>
#include <limits.h>
#include <signal.h> #include <signal.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
@@ -821,6 +823,24 @@ static size_t GetProcessorCount() {
return static_cast<size_t>(sysconf(_SC_NPROCESSORS_ONLN)); return static_cast<size_t>(sysconf(_SC_NPROCESSORS_ONLN));
} }
static void AddPathSeparatorInTestProgramPath(std::vector<char*>& args) {
// To run DeathTest in threadsafe mode, gtest requires that the user must invoke the
// test program via a valid path that contains at least one path separator.
// The reason is that gtest uses clone() + execve() to run DeathTest in threadsafe mode,
// and execve() doesn't read environment variable PATH, so execve() will not success
// until we specify the absolute path or relative path of the test program directly.
if (strchr(args[0], '/') == NULL) {
char path[PATH_MAX];
ssize_t path_len = readlink("/proc/self/exe", path, sizeof(path));
if (path_len <= 0 || path_len >= static_cast<ssize_t>(sizeof(path))) {
perror("readlink");
exit(1);
}
path[path_len] = '\0';
args[0] = strdup(path);
}
}
static void AddGtestFilterSynonym(std::vector<char*>& args) { static void AddGtestFilterSynonym(std::vector<char*>& args) {
// Support --gtest-filter as a synonym for --gtest_filter. // Support --gtest-filter as a synonym for --gtest_filter.
for (size_t i = 1; i < args.size(); ++i) { for (size_t i = 1; i < args.size(); ++i) {
@@ -858,6 +878,7 @@ static bool PickOptions(std::vector<char*>& args, IsolationTestOptions& options)
} }
} }
AddPathSeparatorInTestProgramPath(args);
AddGtestFilterSynonym(args); AddGtestFilterSynonym(args);
// if --bionic-selftest argument is used, only enable self tests, otherwise remove self tests. // if --bionic-selftest argument is used, only enable self tests, otherwise remove self tests.