AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Assert there are some sources when running skpbench

Browse Source 
Change-Id: I6009dfc7c6eabe04b3b6fdf68f38995d718b4fef
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/235278
Commit-Queue: Nathaniel Nifong <nifong@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
This commit is contained in:
Nathaniel Nifong 2019-09-11 14:00:20 -04:00 committed by Skia Commit-Bot
parent 50f377e275
commit f7cf794890
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/skpbench/_adb_path.py
View File

@ -27,7 +27,7 @@ def find_skps(skps):
return __ADB.check('''\ return __ADB.check('''\
for PATHNAME in %s; do for PATHNAME in %s; do
if [ -d "$PATHNAME" ]; then if [ -d "$PATHNAME" ]; then
find "$PATHNAME" -maxdepth 1 -name *.skp find "$PATHNAME" -maxdepth 1 -name '*.skp' -o -name '*.mskp'
else else
echo "$PATHNAME" echo "$PATHNAME"
fi fi

1
tools/skpbench/_os_path.py
View File

@ -17,6 +17,7 @@ def find_skps(skps):
for skp in skps: for skp in skps:
if (path.isdir(skp)): if (path.isdir(skp)):
pathnames.extend(glob.iglob(path.join(skp, '*.skp'))) pathnames.extend(glob.iglob(path.join(skp, '*.skp')))
pathnames.extend(glob.iglob(path.join(skp, '*.mskp')))
else: else:
pathnames.append(skp) pathnames.append(skp)
return pathnames return pathnames

1
tools/skpbench/skpbench.py
View File

@ -327,6 +327,7 @@ def main():
DELIMITER = r'[, ](?!(?:[^(]*\([^)]*\))*[^()]*\))' DELIMITER = r'[, ](?!(?:[^(]*\([^)]*\))*[^()]*\))'
configs = re.split(DELIMITER, FLAGS.config) configs = re.split(DELIMITER, FLAGS.config)
srcs = _path.find_skps(FLAGS.srcs) srcs = _path.find_skps(FLAGS.srcs)
assert srcs
if FLAGS.adb: if FLAGS.adb:
adb = Adb(FLAGS.device_serial, FLAGS.adb_binary, adb = Adb(FLAGS.device_serial, FLAGS.adb_binary,