3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2024-12-27 10:11:03 +08:00
Code Issues Projects Releases Wiki Activity

Remove some filesystem APIs and tests under !GTEST_HAS_FILE_SYSTEM

Browse Source 
PiperOrigin-RevId: 509537606
Change-Id: I68f7054e34b1fe76c1fd85099fffa4ee3c2b00c0
This commit is contained in:
Abseil Team 2023-02-14 08:32:59 -08:00 committed by Copybara-Service
parent b80a07ffe6
commit 2057566e4e
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
googletest/src/gtest.cc
View File

@ -2325,7 +2325,9 @@ static std::vector<std::string> GetReservedAttributesForElement(
return std::vector<std::string>(); return std::vector<std::string>();
} }
#if GTEST_HAS_FILE_SYSTEM
// TODO(jdesprez): Merge the two getReserved attributes once skip is improved // TODO(jdesprez): Merge the two getReserved attributes once skip is improved
// This function is only used when file systems are enabled.
static std::vector<std::string> GetReservedOutputAttributesForElement( static std::vector<std::string> GetReservedOutputAttributesForElement(
const std::string& xml_element) { const std::string& xml_element) {
if (xml_element == "testsuites") { if (xml_element == "testsuites") {
@ -2340,6 +2342,7 @@ static std::vector<std::string> GetReservedOutputAttributesForElement(
// This code is unreachable but some compilers may not realizes that. // This code is unreachable but some compilers may not realizes that.
return std::vector<std::string>(); return std::vector<std::string>();
} }
#endif
static std::string FormatWordList(const std::vector<std::string>& words) { static std::string FormatWordList(const std::vector<std::string>& words) {
Message word_list; Message word_list;
@ -6802,7 +6805,7 @@ std::string TempDir() {
#endif #endif
} }
#if !defined(GTEST_CUSTOM_SRCDIR_FUNCTION_) #if GTEST_HAS_FILE_SYSTEM && !defined(GTEST_CUSTOM_SRCDIR_FUNCTION_)
// Returns the directory path (including terminating separator) of the current // Returns the directory path (including terminating separator) of the current
// executable as derived from argv[0]. // executable as derived from argv[0].
static std::string GetCurrentExecutableDirectory() { static std::string GetCurrentExecutableDirectory() {
@ -6811,6 +6814,7 @@ static std::string GetCurrentExecutableDirectory() {
} }
#endif #endif
#if GTEST_HAS_FILE_SYSTEM
std::string SrcDir() { std::string SrcDir() {
#if defined(GTEST_CUSTOM_SRCDIR_FUNCTION_) #if defined(GTEST_CUSTOM_SRCDIR_FUNCTION_)
return GTEST_CUSTOM_SRCDIR_FUNCTION_(); return GTEST_CUSTOM_SRCDIR_FUNCTION_();
@ -6825,6 +6829,7 @@ std::string SrcDir() {
'/'); '/');
#endif #endif
} }
#endif
// Class ScopedTrace // Class ScopedTrace

4
googletest/test/gtest_dirs_test.cc
View File

@ -7,6 +7,8 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "gtest/internal/gtest-port.h" #include "gtest/internal/gtest-port.h"
#if GTEST_HAS_FILE_SYSTEM
namespace { namespace {
class SetEnv { class SetEnv {
@ -94,4 +96,6 @@ TEST(SrcDirTest, NotInEnvironment) {
EXPECT_NE(testing::SrcDir(), ""); EXPECT_NE(testing::SrcDir(), "");
} }
#endif // GTEST_HAS_FILE_SYSTEM
} // namespace } // namespace