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

Remove unused argument from skqp command-line tool.

Browse Source 
This only affected one helper script; the others just automatically
forward any user-specified arguments.

Change-Id: Icd401d222d14e459e3c4429e2b2fec567834cada
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/517356
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
This commit is contained in:
John Stiles 2022-03-07 16:13:40 -05:00 committed by SkCQ
parent 0cab38e81a
commit 88f360e963
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/skqp/run_skqp_exe
View File

@ -28,7 +28,7 @@ def skqp(build):
adb('push', os.path.join(build, 'skqp'), '/data/local/tmp/skqp/skqp') adb('push', os.path.join(build, 'skqp'), '/data/local/tmp/skqp/skqp')
cmd = "cd /data/local/tmp/skqp; ./skqp skqp_assets '' report" cmd = "cd /data/local/tmp/skqp; ./skqp skqp_assets report"
sys.stdout.write("adb 'shell' '%s'\n" % cmd) sys.stdout.write("adb 'shell' '%s'\n" % cmd)
ret = subprocess.call(['adb', 'shell', cmd]) ret = subprocess.call(['adb', 'shell', cmd])

11
tools/skqp/src/skqp_main.cpp
View File

@ -79,14 +79,13 @@ static bool should_skip(const char* const* rules, size_t count, const char* name
} }
static void parse_args(int argc, char *argv[], Args *args) { static void parse_args(int argc, char *argv[], Args *args) {
if (argc < 4) { if (argc < 3) {
std::cerr << "Usage:\n " << argv[0] std::cerr << "Usage:\n " << argv[0] << " ASSET_DIR OUTPUT_DIR [TEST_MATCH_RULES]\n"
<< " ASSET_DIR UNUSED_ARG OUTPUT_DIR [TEST_MATCH_RULES]\n"
<< kSkipUsage << '\n'; << kSkipUsage << '\n';
exit(1); exit(1);
} }
args->assetDir = argv[1]; args->assetDir = argv[1];
args->outputDir = argv[3]; args->outputDir = argv[2];
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
@ -103,8 +102,8 @@ int main(int argc, char *argv[]) {
skqp.init(&mgr, args.outputDir); skqp.init(&mgr, args.outputDir);
int ret = 0; int ret = 0;
const char* const* matchRules = &argv[4]; const char* const* matchRules = &argv[3];
size_t matchRulesCount = (size_t)(argc - 4); size_t matchRulesCount = (size_t)(argc - 3);
// Unit Tests // Unit Tests
std::ostream& out = std::cout; std::ostream& out = std::cout;