diff options
| -rw-r--r-- | clang/tools/scan-view/Reporter.py | 34 | ||||
| -rw-r--r-- | clang/tools/scan-view/Resources/FileRadar.scpt | bin | 15290 -> 16240 bytes | |||
| -rw-r--r-- | clang/tools/scan-view/ScanView.py | 13 |
3 files changed, 36 insertions, 11 deletions
diff --git a/clang/tools/scan-view/Reporter.py b/clang/tools/scan-view/Reporter.py index a28d0945ac3..5bfe4469061 100644 --- a/clang/tools/scan-view/Reporter.py +++ b/clang/tools/scan-view/Reporter.py @@ -2,7 +2,14 @@ import subprocess, sys, os -__all__ = ['BugReport', 'getReporters'] +__all__ = ['ReportFailure', 'BugReport', 'getReporters'] + +# + +class ReportFailure(Exception): + """Generic exception for failures in bug reporting.""" + def __init__(self, value): + self.value = value # Collect information about a bug. @@ -135,18 +142,29 @@ class RadarReporter: p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) except: - print >>sys.stderr, '%s: SERVER: radar failed'%(sys.argv[0],) - sys.print_exc() - raise + raise ReportFailure("Unable to file radar (AppleScript failure).") data, err = p.communicate() -# print >>sys.stderr, '%s: SERVER: radar report: "%s" "%s"'%(sys.argv[0],data, err) res = p.wait() -# print >>sys.stderr, '%s: SERVER: radar report res: %d'%(sys.argv[0],res,) if res: - raise RuntimeError,'Radar submission failed.' + raise ReportFailure("Unable to file radar (AppleScript failure).") + + try: + values = eval(data) + except: + raise ReportFailure("Unable to process radar results.") - return data.replace('\n','\n<br>') + # We expect (int: bugID, str: message) + if len(values) != 2 or not isinstance(values[0], int): + raise ReportFailure("Unable to process radar results.") + + bugID,message = values + bugID = int(bugID) + + if not bugID: + raise ReportFailure(message) + + return "Filed: <a href=\"rdar://%d/\">%d</a>"%(bugID,bugID) ### diff --git a/clang/tools/scan-view/Resources/FileRadar.scpt b/clang/tools/scan-view/Resources/FileRadar.scpt Binary files differindex 145386c30c6..a22489f38f8 100644 --- a/clang/tools/scan-view/Resources/FileRadar.scpt +++ b/clang/tools/scan-view/Resources/FileRadar.scpt diff --git a/clang/tools/scan-view/ScanView.py b/clang/tools/scan-view/ScanView.py index e340a9fa6cc..5e7bbf4fe8c 100644 --- a/clang/tools/scan-view/ScanView.py +++ b/clang/tools/scan-view/ScanView.py @@ -11,7 +11,7 @@ import threading import time import socket -from Reporter import BugReport +import Reporter # Keys replaced by server. @@ -43,6 +43,13 @@ class ReporterThread(threading.Thread): time.sleep(3) if self.server.options.debug: print >>sys.stderr, "%s: SERVER: submission complete."%(sys.argv[0],) + except Reporter.ReportFailure,e: + s = StringIO.StringIO() + print >>s,'Submission Failed<br><pre>' + print >>s,e.value + print >>s,'</pre>' + self.status = s.getvalue() + return except Exception,e: s = StringIO.StringIO() import traceback @@ -54,8 +61,8 @@ class ReporterThread(threading.Thread): s = StringIO.StringIO() print >>s, 'Submission Complete!' - print >>s, '<hr>' if result is not None: + print >>s, '<hr>' print >>s, result self.status = s.getvalue() @@ -184,7 +191,7 @@ class ScanViewRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): # Create the report. path = os.path.join(self.server.root, 'report-%s.html'%report) files = [path] - br = BugReport(title, description, files) + br = Reporter.BugReport(title, description, files) # Send back an initial response and wait for the report to # finish. |
