changes for googletest env var test
This commit is contained in:
		
							parent
							
								
									e24a161caf
								
							
						
					
					
						commit
						a4eb351386
					
				@ -212,17 +212,17 @@ py_test(
 | 
				
			|||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
cc_binary(
 | 
					cc_binary(
 | 
				
			||||||
    name = "gtest_env_var_test_",
 | 
					    name = "googletest-env-var-test_",
 | 
				
			||||||
    testonly = 1,
 | 
					    testonly = 1,
 | 
				
			||||||
    srcs = ["gtest_env_var_test_.cc"],
 | 
					    srcs = ["googletest-env-var-test_.cc"],
 | 
				
			||||||
    deps = ["//:gtest"],
 | 
					    deps = ["//:gtest"],
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
py_test(
 | 
					py_test(
 | 
				
			||||||
    name = "gtest_env_var_test",
 | 
					    name = "googletest-env-var-test",
 | 
				
			||||||
    size = "small",
 | 
					    size = "medium",
 | 
				
			||||||
    srcs = ["gtest_env_var_test.py"],
 | 
					    srcs = ["googletest-env-var-test.py"],
 | 
				
			||||||
    data = [":gtest_env_var_test_"],
 | 
					    data = [":googletest-env-var-test_"],
 | 
				
			||||||
    deps = [":gtest_test_utils"],
 | 
					    deps = [":gtest_test_utils"],
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -40,7 +40,7 @@ import gtest_test_utils
 | 
				
			|||||||
IS_WINDOWS = os.name == 'nt'
 | 
					IS_WINDOWS = os.name == 'nt'
 | 
				
			||||||
IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'
 | 
					IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_env_var_test_')
 | 
					COMMAND = gtest_test_utils.GetTestExecutablePath('googletest-env-var-test_')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
environ = os.environ.copy()
 | 
					environ = os.environ.copy()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -62,7 +62,7 @@ def SetEnvVar(env_var, value):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def GetFlag(flag):
 | 
					def GetFlag(flag):
 | 
				
			||||||
  """Runs gtest_env_var_test_ and returns its output."""
 | 
					  """Runs googletest-env-var-test_ and returns its output."""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  args = [COMMAND]
 | 
					  args = [COMMAND]
 | 
				
			||||||
  if flag is not None:
 | 
					  if flag is not None:
 | 
				
			||||||
@ -115,7 +115,7 @@ int main(int argc, char** argv) {
 | 
				
			|||||||
  testing::InitGoogleTest(&argc, argv);
 | 
					  testing::InitGoogleTest(&argc, argv);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  if (argc != 2) {
 | 
					  if (argc != 2) {
 | 
				
			||||||
    cout << "Usage: gtest_env_var_test_ NAME_OF_FLAG\n";
 | 
					    cout << "Usage: googletest-env-var-test_ NAME_OF_FLAG\n";
 | 
				
			||||||
    return 1;
 | 
					    return 1;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user