summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-01-14 18:08:38 -0800
committerDan Albert <danalbert@google.com>2015-01-14 18:08:38 -0800
commit2b3c63f7049d05a7affe265fed13516d16e6810e (patch)
treeb13dc29375b57f96aa29c8e31b0036e57df91ac6
parent8234f20ae712e95ececf56ea3d03204eaf6fdc9b (diff)
downloadexternal_libcxx-2b3c63f7049d05a7affe265fed13516d16e6810e.tar.gz
external_libcxx-2b3c63f7049d05a7affe265fed13516d16e6810e.tar.bz2
external_libcxx-2b3c63f7049d05a7affe265fed13516d16e6810e.zip
Ignore failures from failed cleanup.
This `try` used to be in the function above, but an upstream change made it our responsibility. Change-Id: I34f1dca7244f67242b7a8f2979bf7560bc12b706
-rw-r--r--test/libcxx/android/test/format.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/libcxx/android/test/format.py b/test/libcxx/android/test/format.py
index 5897c2e1c..7fae5e101 100644
--- a/test/libcxx/android/test/format.py
+++ b/test/libcxx/android/test/format.py
@@ -104,7 +104,10 @@ class TestFormat(HostTestFormat):
exec_file = os.path.basename(exec_path)
cmd = ['adb', 'shell', 'rm', '-rf', self._working_directory(exec_file)]
lit.util.executeCommand(cmd)
- os.remove(exec_path)
+ try:
+ os.remove(exec_path)
+ except OSError:
+ pass
def _run(self, exec_path, lit_config, in_dir=None):
exec_file = os.path.basename(exec_path)