Commit 56e4be21 authored by YM CHEN's avatar YM CHEN Committed by Praveen Kumar Ramakrishnan

fix namespace v2

Summary: Signed-off-by: Nicholas Ormrod <njormrod@fb.com>

Test Plan:
fbconfig -r folly && fbmake runtests

Reviewed By: yfeldblum@fb.com

Subscribers: fugalh, folly-diffs@, jsedgwick, yfeldblum, chalfant

FB internal diff: D2043151

Tasks: 6783581
parent 4c929bc5
...@@ -23,7 +23,7 @@ namespace google { using namespace gflags; } ...@@ -23,7 +23,7 @@ namespace google { using namespace gflags; }
int main(int argc, char** argv) { int main(int argc, char** argv) {
testing::InitGoogleTest(&argc, argv); testing::InitGoogleTest(&argc, argv);
google::ParseCommandLineFlags(&argc, &argv, true); gflags::ParseCommandLineFlags(&argc, &argv, true);
auto rc = RUN_ALL_TESTS(); auto rc = RUN_ALL_TESTS();
folly::runBenchmarksOnFlag(); folly::runBenchmarksOnFlag();
......
...@@ -503,7 +503,7 @@ int main(int argc, char **argv) { ...@@ -503,7 +503,7 @@ int main(int argc, char **argv) {
FLAGS_logtostderr = true; FLAGS_logtostderr = true;
google::InitGoogleLogging(argv[0]); google::InitGoogleLogging(argv[0]);
testing::InitGoogleTest(&argc, argv); testing::InitGoogleTest(&argc, argv);
google::ParseCommandLineFlags(&argc, &argv, true); gflags::ParseCommandLineFlags(&argc, &argv, true);
return RUN_ALL_TESTS(); return RUN_ALL_TESTS();
} }
......
...@@ -16,9 +16,10 @@ ...@@ -16,9 +16,10 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <gflags/gflags.h> #include <gflags/gflags.h>
#include <folly/Portability.h>
int main(int argc, char** argv) { int main(int argc, char** argv) {
::testing::InitGoogleTest(&argc, argv); ::testing::InitGoogleTest(&argc, argv);
::google::ParseCommandLineFlags(&argc, &argv, true); ::gflags::ParseCommandLineFlags(&argc, &argv, true);
return RUN_ALL_TESTS(); return RUN_ALL_TESTS();
} }
...@@ -226,6 +226,6 @@ TEST(ShutdownSocketSetTest, AbortiveKill) { ...@@ -226,6 +226,6 @@ TEST(ShutdownSocketSetTest, AbortiveKill) {
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
testing::InitGoogleTest(&argc, argv); testing::InitGoogleTest(&argc, argv);
google::ParseCommandLineFlags(&argc, &argv, true); gflags::ParseCommandLineFlags(&argc, &argv, true);
return RUN_ALL_TESTS(); return RUN_ALL_TESTS();
} }
...@@ -531,7 +531,7 @@ BENCHMARK_RELATIVE(FollySingletonWeak, n) { ...@@ -531,7 +531,7 @@ BENCHMARK_RELATIVE(FollySingletonWeak, n) {
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
testing::InitGoogleTest(&argc, argv); testing::InitGoogleTest(&argc, argv);
google::InitGoogleLogging(argv[0]); google::InitGoogleLogging(argv[0]);
google::ParseCommandLineFlags(&argc, &argv, true); gflags::ParseCommandLineFlags(&argc, &argv, true);
SingletonVault::singleton()->registrationComplete(); SingletonVault::singleton()->registrationComplete();
......
...@@ -48,7 +48,7 @@ BENCHMARK(folly_toLowerAscii, iters) { ...@@ -48,7 +48,7 @@ BENCHMARK(folly_toLowerAscii, iters) {
} }
int main(int argc, char** argv) { int main(int argc, char** argv) {
google::ParseCommandLineFlags(&argc, &argv, true); gflags::ParseCommandLineFlags(&argc, &argv, true);
folly::runBenchmarks(); folly::runBenchmarks();
if (FLAGS_benchmark) { if (FLAGS_benchmark) {
folly::runBenchmarks(); folly::runBenchmarks();
......
...@@ -205,7 +205,7 @@ TEST(Wangle, SuperComplexFilterTest) { ...@@ -205,7 +205,7 @@ TEST(Wangle, SuperComplexFilterTest) {
int main(int argc, char** argv) { int main(int argc, char** argv) {
testing::InitGoogleTest(&argc, argv); testing::InitGoogleTest(&argc, argv);
google::InitGoogleLogging(argv[0]); google::InitGoogleLogging(argv[0]);
google::ParseCommandLineFlags(&argc, &argv, true); gflags::ParseCommandLineFlags(&argc, &argv, true);
return RUN_ALL_TESTS(); return RUN_ALL_TESTS();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment