diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Tools/BuildSlaveSupport/test-result-archive | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Tools/BuildSlaveSupport/test-result-archive')
| -rw-r--r-- | Tools/BuildSlaveSupport/test-result-archive | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Tools/BuildSlaveSupport/test-result-archive b/Tools/BuildSlaveSupport/test-result-archive index a4d3ca3..b34e04a 100644 --- a/Tools/BuildSlaveSupport/test-result-archive +++ b/Tools/BuildSlaveSupport/test-result-archive @@ -90,7 +90,11 @@ def archiveTestResults(configuration, platform, layoutTestResultsDir): # deleting its contents, claiming "Directory not empty". # We can safely ignore this since it was the directory contents that # we are most interested in deleting. - if e.errno != 90: + # Python in Cygwin will also sometimes throw errno 2 if a process is + # holding a file open. There's no point in failing to create the + # archive just because some other process is behaving badly. See + # <http://webkit.org/b/55581>. + if e.errno != 90 and e.errno != 2: raise def zipFilesRecursively(archiveFile, files): |