diff options
| author |  csmartdalton <csmartdalton@google.com> | 2016-09-22 12:37:21 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-22 12:37:22 -0700 |
| commit | 5745d795a15333f80c7526bf3643212773c5b3b7 (patch) | |
| tree | 7c4745e5dbf7bf292137caba3d7ec5d8edb85d9b /tools/skpbench | |
| parent | cf7b877d62537672b67449bc96858cc1262be5f8 (diff) | |
skpbench fixes for linux
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2354273004
Review-Url: https://codereview.chromium.org/2354273004
Diffstat (limited to 'tools/skpbench')
| -rw-r--r-- | tools/skpbench/_adb_path.py | 2 | ||||
| -rwxr-xr-x | tools/skpbench/skpbench.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/skpbench/_adb_path.py b/tools/skpbench/_adb_path.py index 47eb7de17e..72382bc1dc 100644 --- a/tools/skpbench/_adb_path.py +++ b/tools/skpbench/_adb_path.py @@ -25,7 +25,7 @@ def find_skps(skps): return __ADB.check_lines('''\ for PATHNAME in %s; do if [ -d "$PATHNAME" ]; then - ls "$PATHNAME"/*.skp + find "$PATHNAME" -maxdepth 1 -name *.skp else echo "$PATHNAME" fi diff --git a/tools/skpbench/skpbench.py b/tools/skpbench/skpbench.py index b84b0703a0..6b226e0a57 100755 --- a/tools/skpbench/skpbench.py +++ b/tools/skpbench/skpbench.py @@ -10,7 +10,7 @@ from _adb import Adb from _benchresult import BenchResult from _hardware import HardwareException, Hardware from argparse import ArgumentParser -from queue import Queue +from multiprocessing import Queue from threading import Thread, Timer import collections import glob |