diff options
| author |  epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-08 20:53:28 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-08 20:53:28 +0000 |
| commit | ba7ef37a0405f27b44dd29673588e6b3c5b07799 (patch) | |
| tree | dc4418958e9f927069d0f9d6b4bf48da52d1e21c /tools | |
| parent | e33e137623d56a9d61f00ef74c6ad2e998613062 (diff) | |
rebaseline.py: look in gm-expected directory to see whether it's using git or svn
(before this change, it checked in the current working dir instead)
Review URL: https://codereview.chromium.org/18209010
git-svn-id: http://skia.googlecode.com/svn/trunk@9913 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/rebaseline_imagefiles.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/rebaseline_imagefiles.py b/tools/rebaseline_imagefiles.py index 6c60745690..ee11e5358a 100755 --- a/tools/rebaseline_imagefiles.py +++ b/tools/rebaseline_imagefiles.py @@ -82,11 +82,11 @@ class ImageRebaseliner(object): 'http://chromium-skia-gm.commondatastorage.googleapis.com/gm') self._testname_pattern = re.compile('(\S+)_(\S+).png') self._is_svn_checkout = ( - os.path.exists('.svn') or - os.path.exists(os.path.join(os.pardir, '.svn'))) + os.path.exists(os.path.join(expectations_root, '.svn')) or + os.path.exists(os.path.join(expectations_root, os.pardir, '.svn'))) self._is_git_checkout = ( - os.path.exists('.git') or - os.path.exists(os.path.join(os.pardir, '.git'))) + os.path.exists(os.path.join(expectations_root, '.git')) or + os.path.exists(os.path.join(expectations_root, os.pardir, '.git'))) # If dry_run is False, execute subprocess.call(cmd). # If dry_run is True, print the command we would have otherwise run. |