diff options
| author | carlosk <carlosk@chromium.org> | 2015-12-11 11:31:08 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-11 19:33:00 +0000 |
| commit | b8f5699ae917b8db9a653989d90e0173cd80023d (patch) | |
| tree | 80238bbcb4aa598db41fb73ffa8a14f474e80001 /build | |
| parent | 40206043977c5e7de9e769fdaa88e04ec21b17a7 (diff) | |
| download | chromium_src-b8f5699ae917b8db9a653989d90e0173cd80023d.zip chromium_src-b8f5699ae917b8db9a653989d90e0173cd80023d.tar.gz chromium_src-b8f5699ae917b8db9a653989d90e0173cd80023d.tar.bz2 | |
Fix Android test_runner issue with symbolic lynks for output directories.
As I compile for both Android and Linux from my checkout my "out" directory
is a symbolic lynk to either out_android or out_linux depending on what
I'm working with. This change fixes a key mismatching issue where the
key stored in the dictionary would still keep symbolic links while in
most other places they are resolved using os.path.realpath.
BUG=
Review URL: https://codereview.chromium.org/1513223005
Cr-Commit-Position: refs/heads/master@{#364772}
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/devil/android/md5sum.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/android/devil/android/md5sum.py b/build/android/devil/android/md5sum.py index bae134d..5270646 100644 --- a/build/android/devil/android/md5sum.py +++ b/build/android/devil/android/md5sum.py @@ -33,7 +33,8 @@ def CalculateHostMd5Sums(paths): md5sum_bin_host_path = devil_env.config.FetchPath('md5sum_host') if not os.path.exists(md5sum_bin_host_path): raise IOError('File not built: %s' % md5sum_bin_host_path) - out = cmd_helper.GetCmdOutput([md5sum_bin_host_path] + [p for p in paths]) + out = cmd_helper.GetCmdOutput( + [md5sum_bin_host_path] + [os.path.realpath(p) for p in paths]) return _ParseMd5SumOutput(out.splitlines()) |