New test suite option (-T)
When -T is specified, the test suite will call svn info and dump the output on screen (this used to be the default behavior) When -T is not specified, this step won't be performed (the new default) llvm-svn: 179342
This commit is contained in:
		
							parent
							
								
									ea6a58e2ae
								
							
						
					
					
						commit
						af5bbe8f74
					
				| 
						 | 
					@ -216,6 +216,9 @@ sdir_has_content = False
 | 
				
			||||||
# svn_info stores the output from 'svn info lldb.base.dir'.
 | 
					# svn_info stores the output from 'svn info lldb.base.dir'.
 | 
				
			||||||
svn_info = ''
 | 
					svn_info = ''
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# svn_silent means do not try to obtain svn status
 | 
				
			||||||
 | 
					svn_silent = True
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Default verbosity is 0.
 | 
					# Default verbosity is 0.
 | 
				
			||||||
verbose = 1
 | 
					verbose = 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -355,6 +358,7 @@ def parseOptionsAndInitTestdirs():
 | 
				
			||||||
    global regexp
 | 
					    global regexp
 | 
				
			||||||
    global rdir
 | 
					    global rdir
 | 
				
			||||||
    global sdir_name
 | 
					    global sdir_name
 | 
				
			||||||
 | 
					    global svn_silent
 | 
				
			||||||
    global verbose
 | 
					    global verbose
 | 
				
			||||||
    global testdirs
 | 
					    global testdirs
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -419,6 +423,7 @@ def parseOptionsAndInitTestdirs():
 | 
				
			||||||
    group.add_argument('-u', dest='unset_env_varnames', metavar='variable', action='append', help='Specify an environment variable to unset before running the test cases. e.g., -u DYLD_INSERT_LIBRARIES -u MallocScribble')
 | 
					    group.add_argument('-u', dest='unset_env_varnames', metavar='variable', action='append', help='Specify an environment variable to unset before running the test cases. e.g., -u DYLD_INSERT_LIBRARIES -u MallocScribble')
 | 
				
			||||||
    X('-v', 'Do verbose mode of unittest framework (print out each test case invocation)')
 | 
					    X('-v', 'Do verbose mode of unittest framework (print out each test case invocation)')
 | 
				
			||||||
    X('-w', 'Insert some wait time (currently 0.5 sec) between consecutive test cases')
 | 
					    X('-w', 'Insert some wait time (currently 0.5 sec) between consecutive test cases')
 | 
				
			||||||
 | 
					    X('-T', 'Obtain and dump svn information for this checkout of LLDB (off by default)')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Remove the reference to our helper function
 | 
					    # Remove the reference to our helper function
 | 
				
			||||||
    del X
 | 
					    del X
 | 
				
			||||||
| 
						 | 
					@ -594,6 +599,9 @@ def parseOptionsAndInitTestdirs():
 | 
				
			||||||
    if args.t:
 | 
					    if args.t:
 | 
				
			||||||
        os.environ['LLDB_COMMAND_TRACE'] = 'YES'
 | 
					        os.environ['LLDB_COMMAND_TRACE'] = 'YES'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if args.T:
 | 
				
			||||||
 | 
					        svn_silent = False
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if args.v:
 | 
					    if args.v:
 | 
				
			||||||
        verbose = 2
 | 
					        verbose = 2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -713,6 +721,7 @@ def setupSysPath():
 | 
				
			||||||
    global dumpSysPath
 | 
					    global dumpSysPath
 | 
				
			||||||
    global noHeaders
 | 
					    global noHeaders
 | 
				
			||||||
    global svn_info
 | 
					    global svn_info
 | 
				
			||||||
 | 
					    global svn_silent
 | 
				
			||||||
    global lldbFrameworkPath
 | 
					    global lldbFrameworkPath
 | 
				
			||||||
    global lldbExecutablePath
 | 
					    global lldbExecutablePath
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -833,7 +842,7 @@ def setupSysPath():
 | 
				
			||||||
        #print "The 'lldb' from PATH env variable", lldbExec
 | 
					        #print "The 'lldb' from PATH env variable", lldbExec
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Skip printing svn/git information when running in parsable (lit-test compatibility) mode
 | 
					    # Skip printing svn/git information when running in parsable (lit-test compatibility) mode
 | 
				
			||||||
    if not parsable:
 | 
					    if not svn_silent and not parsable:
 | 
				
			||||||
        if os.path.isdir(os.path.join(base, '.svn')) and which("svn") is not None:
 | 
					        if os.path.isdir(os.path.join(base, '.svn')) and which("svn") is not None:
 | 
				
			||||||
            pipe = subprocess.Popen([which("svn"), "info", base], stdout = subprocess.PIPE)
 | 
					            pipe = subprocess.Popen([which("svn"), "info", base], stdout = subprocess.PIPE)
 | 
				
			||||||
            svn_info = pipe.stdout.read()
 | 
					            svn_info = pipe.stdout.read()
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue