[LNT] r266681 - Collect -ftime-report data in LNT diagnostics

[Chris Matthews via llvm-commits]

Author: cmatthews
Date: Mon Apr 18 16:49:21 2016
New Revision: 266681

URL: http://llvm.org/viewvc/llvm-project?rev=266681&view=rev
Log:
Collect -ftime-report data in LNT diagnostics

Modified:
    lnt/trunk/lnt/tests/test_suite.py
    lnt/trunk/tests/runtest/Inputs/test-suite-cmake/fake-diagnose-make
    lnt/trunk/tests/runtest/test_suite_diagnose.py

Modified: lnt/trunk/lnt/tests/test_suite.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/tests/test_suite.py?rev=266681&r1=266680&r2=266681&view=diff
==============================================================================
--- lnt/trunk/lnt/tests/test_suite.py (original)
+++ lnt/trunk/lnt/tests/test_suite.py Mon Apr 18 16:49:21 2016
@@ -742,6 +742,22 @@ class TestSuiteTest(BuiltinTest):
         self._cp_artifacts(local_path, report_path, save_temps_file)
         self._cp_artifacts(temp_files, report_path, build_files)
 
+        # Now lets do -ftime-report.
+        cmd_time_report = cmd + ['-DTEST_SUITE_DIAGNOSE_FLAGS=-ftime-report']
+
+        note(' '.join(cmd_time_report))
+        
+        out = subprocess.check_output(cmd_time_report)
+        note(out)
+
+        make_time_report = [self.opts.make, "VERBOSE=1", short_name]
+        p = subprocess.Popen(make_time_report, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        std_out, std_err = p.communicate()
+
+        with open(report_path + "/time-report.txt", 'w') as f:
+            f.write(std_err)
+        note("Wrote: " + report_path + "/time-report.txt")
+
         note("Report produced in: " + report_path)
 
         # Run through the rest of LNT, but don't allow this to be submitted

Modified: lnt/trunk/tests/runtest/Inputs/test-suite-cmake/fake-diagnose-make
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/runtest/Inputs/test-suite-cmake/fake-diagnose-make?rev=266681&r1=266680&r2=266681&view=diff
==============================================================================
--- lnt/trunk/tests/runtest/Inputs/test-suite-cmake/fake-diagnose-make (original)
+++ lnt/trunk/tests/runtest/Inputs/test-suite-cmake/fake-diagnose-make Mon Apr 18 16:49:21 2016
@@ -22,14 +22,14 @@ then
 elif [ "$2" == "Bubblesort" ]
 then
     #  Look like we ran the test and made outputs
-    mkdir -p SingleSource/Benchmarks/Stanford/
+    mkdir -p SingleSource/Benchmarks/Stanford/CMakeFiles/Bubblesort.dir/
     touch SingleSource/Benchmarks/Stanford/${2}
     echo "RUN: Bubblesort | grep test" > SingleSource/Benchmarks/Stanford/${2}.test
     echo "output file" > SingleSource/Benchmarks/Stanford/${2}.s
     echo "output file" > SingleSource/Benchmarks/Stanford/${2}.i
     echo "output file" > SingleSource/Benchmarks/Stanford/${2}.bc
-    echo "output file" > SingleSource/Benchmarks/Stanford/${2}.o
-
+    echo "output file" > SingleSource/Benchmarks/Stanford/CMakeFiles/Bubblesort.dir/${2}.o
+    (>&2 echo "ftime-report data")
 else
     echo "Unexpected Argument"
     exit 1

Modified: lnt/trunk/tests/runtest/test_suite_diagnose.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/runtest/test_suite_diagnose.py?rev=266681&r1=266680&r2=266681&view=diff
==============================================================================
--- lnt/trunk/tests/runtest/test_suite_diagnose.py (original)
+++ lnt/trunk/tests/runtest/test_suite_diagnose.py Mon Apr 18 16:49:21 2016
@@ -32,3 +32,11 @@
 
 # CHECK-DIAGNOSE: Report produced in:
 # CHECK-DIAGNOSE: Bubblesort.report
+# RUN: stat Bubblesort.report
+# RUN: stat Bubblesort.report/Bubblesort
+# RUN: stat Bubblesort.report/Bubblesort.bc
+# RUN: stat Bubblesort.report/Bubblesort.o
+# RUN: stat Bubblesort.report/Bubblesort.i
+# RUN: stat Bubblesort.report/Bubblesort.s
+# RUN: stat Bubblesort.report/Bubblesort.test
+# RUN: stat Bubblesort.report/time-report.txt