aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/rebaseline_server/imagediffdb.py
diff options
context:
space:
mode:
authorGravatar epoger <epoger@google.com>2014-07-17 12:54:16 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-07-17 12:54:16 -0700
commit66ed8dc4bfd63e4552a213cb17909f9fbbf59abd (patch)
tree4d48cfa8ba43750c051f542f23b48b5f953e58ea /gm/rebaseline_server/imagediffdb.py
parent733418f91e4d90f4ec250d9a97120618a5a89b49 (diff)
combine base_unittest.py modules from gm and tools
general cleanup, which will also help with http://skbug.com/2752 ('split existing "gpu" GM results into "gl" and "gles"') R=rmistry@google.com Author: epoger@google.com Review URL: https://codereview.chromium.org/397103003
Diffstat (limited to 'gm/rebaseline_server/imagediffdb.py')
-rw-r--r--gm/rebaseline_server/imagediffdb.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/gm/rebaseline_server/imagediffdb.py b/gm/rebaseline_server/imagediffdb.py
index f6071f9700..89f9fef319 100644
--- a/gm/rebaseline_server/imagediffdb.py
+++ b/gm/rebaseline_server/imagediffdb.py
@@ -9,21 +9,20 @@ found in the LICENSE file.
Calulate differences between image pairs, and store them in a database.
"""
+# System-level imports
import contextlib
import json
import logging
import os
import re
import shutil
-import sys
import tempfile
import urllib
-# Set the PYTHONPATH to include the tools directory.
-sys.path.append(
- os.path.join(
- os.path.dirname(os.path.realpath(__file__)), os.pardir, os.pardir,
- 'tools'))
+# Must fix up PYTHONPATH before importing from within Skia
+import fix_pythonpath # pylint: disable=W0611
+
+# Imports from within Skia
import find_run_binary
SKPDIFF_BINARY = find_run_binary.find_path_to_program('skpdiff')