[LNT] r263923 - [test-suite] Add a 'succinct' option

[James Molloy via llvm-commits]

Author: jamesm
Date: Mon Mar 21 05:45:44 2016
New Revision: 263923

URL: http://llvm.org/viewvc/llvm-project?rev=263923&view=rev
Log:
[test-suite] Add a 'succinct' option

Chris made VERBOSE=1 mandatory for 'make'. This makes sense, but it really does create a lot of output sometimes. Add a way to override that; --succinct-compile-output.

Modified:
    lnt/trunk/lnt/tests/test_suite.py
    lnt/trunk/tests/runtest/test_suite.py

Modified: lnt/trunk/lnt/tests/test_suite.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/tests/test_suite.py?rev=263923&r1=263922&r2=263923&view=diff
==============================================================================
--- lnt/trunk/lnt/tests/test_suite.py (original)
+++ lnt/trunk/lnt/tests/test_suite.py Mon Mar 21 05:45:44 2016
@@ -151,6 +151,9 @@ class TestSuiteTest(BuiltinTest):
         group.add_option("-v", "--verbose", dest="verbose",
                          help="show verbose test results",
                          action="store_true", default=False)
+        group.add_option("", "--succinct-compile-output",
+                         help="run Make without VERBOSE=1",
+                         action="store_true", dest="succinct")
         group.add_option("", "--exclude-stat-from-submission",
                          dest="exclude_stat_from_submission",
                          help="Do not submit the stat of this type [%default]",
@@ -428,16 +431,18 @@ class TestSuiteTest(BuiltinTest):
         subdir = path
         target = 'all'
         if self.opts.only_test:
-            components = [path] + self.opts.only_test[0]
+            components = [path] + [self.opts.only_test[0]]
             if self.opts.only_test[1]:
                 target = self.opts.only_test[1]
             subdir = os.path.join(*components)
 
         note('Building...')
+        if not self.opts.succinct:
+            args = ["VERBOSE=1", target]
+        else:
+            args = [target]
         self._check_call([make_cmd,
-                          '-j', str(self._build_threads()),
-                          "VERBOSE=1",
-                          target],
+                          '-j', str(self._build_threads())] + args,
                          cwd=subdir)
 
     def _lit(self, path, test):

Modified: lnt/trunk/tests/runtest/test_suite.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/runtest/test_suite.py?rev=263923&r1=263922&r2=263923&view=diff
==============================================================================
--- lnt/trunk/tests/runtest/test_suite.py (original)
+++ lnt/trunk/tests/runtest/test_suite.py Mon Mar 21 05:45:44 2016
@@ -244,11 +244,13 @@
 # RUN:     --use-make %S/Inputs/test-suite-cmake/fake-make \
 # RUN:     --use-lit %S/Inputs/test-suite-cmake/fake-lit \
 # RUN:     --benchmarking-only \
+# RUN:     --succinct-compile-output \
 # RUN:     --verbose \
 # RUN:     > %t.log 2> %t.err
 # RUN: FileCheck --check-prefix CHECK-BENCHONLY < %t.err %s
 # CHECK-BENCHONLY: Configuring with {
 # CHECK-BENCHONLY:   TEST_SUITE_BENCHMARKING_ONLY: 'ON'
+# CHECK-BENCHONLY-NOT: VERBOSE=1
 
 # Check --use-perf
 # RUN: lnt runtest test-suite \