projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2017
[folly.git]
/
folly
/
experimental
/
test
/
ProgramOptionsTest.cpp
diff --git
a/folly/experimental/test/ProgramOptionsTest.cpp
b/folly/experimental/test/ProgramOptionsTest.cpp
index 9dd175c13e75beb9aa7921c563bfb4fef69ead26..d5f58bc70c88b00c03b5fc6488e0abe2c3e60bb0 100644
(file)
--- a/
folly/experimental/test/ProgramOptionsTest.cpp
+++ b/
folly/experimental/test/ProgramOptionsTest.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 201
6
Facebook, Inc.
+ * Copyright 201
7
Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-19,8
+19,8
@@
#include <folly/FileUtil.h>
#include <folly/Subprocess.h>
#include <folly/experimental/io/FsUtil.h>
#include <folly/FileUtil.h>
#include <folly/Subprocess.h>
#include <folly/experimental/io/FsUtil.h>
+#include <folly/portability/GTest.h>
#include <glog/logging.h>
#include <glog/logging.h>
-#include <gtest/gtest.h>
namespace folly { namespace test {
namespace folly { namespace test {
@@
-33,7
+33,7
@@
std::string getHelperPath() {
if (!fs::exists(path)) {
path = path.parent_path().parent_path() / basename / basename;
}
if (!fs::exists(path)) {
path = path.parent_path().parent_path() / basename / basename;
}
- return path.
native
();
+ return path.
string
();
}
std::string callHelper(ProgramOptionsStyle style,
}
std::string callHelper(ProgramOptionsStyle style,