Merges and also adding new bazel build mode
This commit is contained in:
		
							parent
							
								
									9f2c3d4cac
								
							
						
					
					
						commit
						d9df92287e
					
				@ -104,6 +104,7 @@ cc_library(
 | 
			
		||||
    deps = select ({
 | 
			
		||||
        ":has_absl": [
 | 
			
		||||
        "@com_google_absl//absl/types:optional",
 | 
			
		||||
        "@com_google_absl//absl/strings"
 | 
			
		||||
        ],
 | 
			
		||||
        "//conditions:default": [],
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@ -33,3 +33,4 @@ set -e
 | 
			
		||||
 | 
			
		||||
bazel build --curses=no //...:all
 | 
			
		||||
bazel test --curses=no //...:all
 | 
			
		||||
bazel test --curses=no //...:all --define absl=1
 | 
			
		||||
 | 
			
		||||
@ -113,6 +113,7 @@
 | 
			
		||||
 | 
			
		||||
#if GTEST_HAS_ABSL
 | 
			
		||||
#include "absl/types/optional.h"
 | 
			
		||||
#include "absl/strings/string_view.h"
 | 
			
		||||
#endif  // GTEST_HAS_ABSL
 | 
			
		||||
 | 
			
		||||
namespace testing {
 | 
			
		||||
@ -629,7 +630,7 @@ inline void PrintTo(const ::std::wstring& s, ::std::ostream* os) {
 | 
			
		||||
#if GTEST_HAS_ABSL
 | 
			
		||||
// Overload for absl::string_view.
 | 
			
		||||
inline void PrintTo(absl::string_view sp, ::std::ostream* os) {
 | 
			
		||||
  PrintTo(string(sp), os);
 | 
			
		||||
  PrintTo(::std::string(sp), os);
 | 
			
		||||
}
 | 
			
		||||
#endif  // GTEST_HAS_ABSL
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user