Address a bunch of clang-tidy complaints.
There were a bunch more unreasonable/incorrect ones, but these ones
seemed legit. Nothing very interesting, though.
Bug: N/A
Test: ran tests, benchmarks
Change-Id: If66971194d4a7b4bf6d0251bedb88e8cdc88a76f
diff --git a/tests/TemporaryFile.h b/tests/TemporaryFile.h
index 5c2fe4f..070b71a 100644
--- a/tests/TemporaryFile.h
+++ b/tests/TemporaryFile.h
@@ -22,7 +22,7 @@
template <typename T = int (*)(char*)>
class GenericTemporaryFile {
public:
- GenericTemporaryFile(T mk_fn = mkstemp) : mk_fn(mk_fn) {
+ explicit GenericTemporaryFile(T mk_fn = mkstemp) : mk_fn(mk_fn) {
// Since we might be running on the host or the target, and if we're
// running on the host we might be running under bionic or glibc,
// let's just try both possible temporary directories and take the
@@ -33,7 +33,7 @@
}
}
- GenericTemporaryFile(const char* dirpath, T mk_fn = mkstemp) : mk_fn(mk_fn) {
+ explicit GenericTemporaryFile(const char* dirpath, T mk_fn = mkstemp) : mk_fn(mk_fn) {
init(dirpath);
}
diff --git a/tests/dlext_test.cpp b/tests/dlext_test.cpp
index 04b83f2..64cfa08 100644
--- a/tests/dlext_test.cpp
+++ b/tests/dlext_test.cpp
@@ -425,7 +425,7 @@
}
void CreateRelroFile(const char* lib, const char* relro_file) {
- int relro_fd = open(relro_file, O_RDWR | O_TRUNC);
+ int relro_fd = open(relro_file, O_RDWR | O_TRUNC | O_CLOEXEC);
ASSERT_NOERROR(relro_fd);
pid_t pid = fork();
@@ -447,7 +447,7 @@
AssertChildExited(pid, 0);
// reopen file for reading so it can be used
- relro_fd = open(relro_file, O_RDONLY);
+ relro_fd = open(relro_file, O_RDONLY | O_CLOEXEC);
ASSERT_NOERROR(relro_fd);
extinfo_.flags |= ANDROID_DLEXT_USE_RELRO;
extinfo_.relro_fd = relro_fd;
diff --git a/tests/gtest_main.cpp b/tests/gtest_main.cpp
index 33dbfd9..6b20094 100644
--- a/tests/gtest_main.cpp
+++ b/tests/gtest_main.cpp
@@ -90,7 +90,6 @@
} // namespace testing
using testing::internal::GTestColor;
-using testing::internal::COLOR_DEFAULT;
using testing::internal::COLOR_RED;
using testing::internal::COLOR_GREEN;
using testing::internal::COLOR_YELLOW;
@@ -274,8 +273,7 @@
}
static bool EnumerateTests(int argc, char** argv, std::vector<TestCase>& testcase_list) {
- std::vector<const char*> args;
- for (int i = 0; i < argc; ++i) args.push_back(argv[i]);
+ std::vector<const char*> args(argv, argv + argc);
args.push_back("--gtest_list_tests");
args.push_back(nullptr);
@@ -543,7 +541,7 @@
const std::vector<TestCase>& testcase_list,
time_t epoch_iteration_start_time,
int64_t elapsed_time_ns) {
- FILE* fp = fopen(xml_output_filename.c_str(), "w");
+ FILE* fp = fopen(xml_output_filename.c_str(), "we");
if (fp == NULL) {
fprintf(stderr, "failed to open '%s': %s\n", xml_output_filename.c_str(), strerror(errno));
exit(1);
@@ -1185,10 +1183,7 @@
g_argc = argc;
g_argv = argv;
g_envp = envp;
- std::vector<char*> arg_list;
- for (int i = 0; i < argc; ++i) {
- arg_list.push_back(argv[i]);
- }
+ std::vector<char*> arg_list(argv, argv + argc);
IsolationTestOptions options;
if (PickOptions(arg_list, options) == false) {
diff --git a/tests/utils.h b/tests/utils.h
index a5783af..3f4218e 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -180,10 +180,10 @@
return const_cast<char**>(env_.data());
}
- void SetArgs(const std::vector<const char*> args) {
+ void SetArgs(const std::vector<const char*>& args) {
args_ = args;
}
- void SetEnv(const std::vector<const char*> env) {
+ void SetEnv(const std::vector<const char*>& env) {
env_ = env;
}