[Lldb-commits] [lldb] r255152 - Delete the -n command line option from dotest.py.

[Zachary Turner via lldb-commits]

Author: zturner
Date: Wed Dec  9 14:48:42 2015
New Revision: 255152

URL: http://llvm.org/viewvc/llvm-project?rev=255152&view=rev
Log:
Delete the -n command line option from dotest.py.

This removes the option to not print some one time version and
diagnostic information when running the test suite.

Modified:
    lldb/trunk/packages/Python/lldbsuite/test/configuration.py
    lldb/trunk/packages/Python/lldbsuite/test/dotest.py
    lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py

Modified: lldb/trunk/packages/Python/lldbsuite/test/configuration.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/configuration.py?rev=255152&r1=255151&r2=255152&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/configuration.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/configuration.py Wed Dec  9 14:48:42 2015
@@ -100,10 +100,6 @@ skip_build_and_cleanup = False
 # By default, we skip long running test case.  Use '-l' option to override.
 skip_long_running_test = True
 
-# By default, we print the build dir, lldb version, and svn info.  Use '-n' option to
-# turn it off.
-noHeaders = False
-
 # Parsable mode silences headers, and any other output this script might generate, and instead
 # prints machine-readable output similar to what clang tests produce.
 parsable = False

Modified: lldb/trunk/packages/Python/lldbsuite/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/dotest.py?rev=255152&r1=255151&r2=255152&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest.py Wed Dec  9 14:48:42 2015
@@ -330,16 +330,12 @@ def parseOptionsAndInitTestdirs():
     if args.executable:
         lldbtest_config.lldbExec = args.executable
 
-    if args.n:
-        configuration.noHeaders = True
-
     if args.p:
         if args.p.startswith('-'):
             usage(parser)
         configuration.regexp = args.p
 
     if args.q:
-        configuration.noHeaders = True
         configuration.parsable = True
 
     if args.P and not args.v:
@@ -697,10 +693,9 @@ def setupSysPath():
     os.environ["LLDB_LIB_DIR"] = lldbLibDir
     lldbImpLibDir = os.path.join(lldbLibDir, '..', 'lib') if sys.platform.startswith('win32') else lldbLibDir
     os.environ["LLDB_IMPLIB_DIR"] = lldbImpLibDir
-    if not configuration.noHeaders:
-        print("LLDB library dir:", os.environ["LLDB_LIB_DIR"])
-        print("LLDB import library dir:", os.environ["LLDB_IMPLIB_DIR"])
-        os.system('%s -v' % lldbtest_config.lldbExec)
+    print("LLDB library dir:", os.environ["LLDB_LIB_DIR"])
+    print("LLDB import library dir:", os.environ["LLDB_IMPLIB_DIR"])
+    os.system('%s -v' % lldbtest_config.lldbExec)
 
     # Assume lldb-mi is in same place as lldb
     # If not found, disable the lldb-mi tests
@@ -722,8 +717,7 @@ def setupSysPath():
         elif os.path.isdir(os.path.join(lldbRootDirectory, '.git')) and which("git") is not None:
             pipe = subprocess.Popen([which("git"), "svn", "info", lldbRootDirectory], stdout = subprocess.PIPE)
             configuration.svn_info = pipe.stdout.read()
-        if not configuration.noHeaders:
-            print(configuration.svn_info)
+        print(configuration.svn_info)
 
     lldbPythonDir = None # The directory that contains 'lldb/__init__.py'
     if configuration.lldbFrameworkPath:
@@ -1112,10 +1106,9 @@ def run_suite():
         configuration.sdir_name = timestamp_started
     os.environ["LLDB_SESSION_DIRNAME"] = os.path.join(os.getcwd(), configuration.sdir_name)
 
-    if not configuration.noHeaders:
-        sys.stderr.write("\nSession logs for test failures/errors/unexpected successes"
-                         " will go into directory '%s'\n" % configuration.sdir_name)
-        sys.stderr.write("Command invoked: %s\n" % getMyCommandLine())
+    sys.stderr.write("\nSession logs for test failures/errors/unexpected successes"
+                        " will go into directory '%s'\n" % configuration.sdir_name)
+    sys.stderr.write("Command invoked: %s\n" % getMyCommandLine())
 
     if not os.path.isdir(configuration.sdir_name):
         try:

Modified: lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py?rev=255152&r1=255151&r2=255152&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py Wed Dec  9 14:48:42 2015
@@ -88,7 +88,6 @@ def create_parser():
     # Test-suite behaviour
     group = parser.add_argument_group('Runtime behaviour options')
     X('-d', 'Suspend the process after launch to wait indefinitely for a debugger to attach')
-    X('-n', "Don't print the headers like build dir, lldb version, and svn info at all")
     X('-P', "Use the graphic progress bar.")
     X('-q', "Don't print extra output from this script.")
     X('-S', "Skip the build and cleanup while running the test. Use this option with care as you would need to build the inferior(s) by hand and build the executable(s) with the correct name(s). This can be used with '-# n' to stress test certain test cases for n number of times")