diff options
author | Hal Canary <halcanary@google.com> | 2018-12-05 11:58:05 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-12-06 14:21:33 +0000 |
commit | b45d5124816ed9048e94e0a8e2b24f745b63cae7 (patch) | |
tree | 59e5744b7ccc18b3dbbf33e91f27c5f383114bb7 | |
parent | 4cb703b4685c0aea038f5934b23aa6f9dd7a0d81 (diff) | |
download | platform_external_skqp-b45d5124816ed9048e94e0a8e2b24f745b63cae7.tar.gz platform_external_skqp-b45d5124816ed9048e94e0a8e2b24f745b63cae7.tar.bz2 platform_external_skqp-b45d5124816ed9048e94e0a8e2b24f745b63cae7.zip |
bin/sysopen: script moved to bin
No-Try: true
Change-Id: I1b9b1be36c9ed2d574de681b90b98e56f45e70fa
Reviewed-on: https://skia-review.googlesource.com/c/174588
Auto-Submit: Hal Canary <halcanary@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
-rwxr-xr-x | bin/sysopen (renamed from tools/skqp/sysopen.py) | 0 | ||||
-rw-r--r-- | experimental/c-api-example/c.md | 3 | ||||
-rw-r--r-- | experimental/documentation/gerrit.md | 2 | ||||
-rw-r--r-- | tools/skqp/README.md | 2 | ||||
-rw-r--r-- | tools/skqp/README_GENERATING_MODELS.md | 4 | ||||
-rwxr-xr-x | tools/skqp/test_apk.sh | 9 |
6 files changed, 6 insertions, 14 deletions
diff --git a/tools/skqp/sysopen.py b/bin/sysopen index f104ab9fa4..f104ab9fa4 100755 --- a/tools/skqp/sysopen.py +++ b/bin/sysopen diff --git a/experimental/c-api-example/c.md b/experimental/c-api-example/c.md index 19ae515f19..d1732362f8 100644 --- a/experimental/c-api-example/c.md +++ b/experimental/c-api-example/c.md @@ -127,5 +127,4 @@ Ubuntu. experimental/c-api-example/skia-c-example.c \ "$SKIA_LIB_DIR"/libskia.* -Wl,-rpath -Wl,"$SKIA_LIB_DIR" ./skia-c-example - [ $(uname) = Darwin ] && open skia-c-example.png - [ $(uname) = Linux ] && xdg-open skia-c-example.png + bin/sysopen skia-c-example.png diff --git a/experimental/documentation/gerrit.md b/experimental/documentation/gerrit.md index 45894fb443..10b79eb1eb 100644 --- a/experimental/documentation/gerrit.md +++ b/experimental/documentation/gerrit.md @@ -69,7 +69,7 @@ Creating a Change 5. Open in web browser: - echo https://skia-review.googlesource.com/c/skia/+/$(bin/gerrit-number @) + bin/sysopen https://skia-review.googlesource.com/c/skia/+/$(bin/gerrit-number @) Updating a Change ----------------- diff --git a/tools/skqp/README.md b/tools/skqp/README.md index 232920af85..62282186e3 100644 --- a/tools/skqp/README.md +++ b/tools/skqp/README.md @@ -65,7 +65,7 @@ How to build and run the SkQP tests OUTPUT_LOCATION="/storage/emulated/0/Android/data/org.skia.skqp/files/output" adb pull $OUTPUT_LOCATION /tmp/ - tools/skqp/sysopen.py /tmp/output/skqp_report/report.html + bin/sysopen /tmp/output/skqp_report/report.html Running a single test --------------------- diff --git a/tools/skqp/README_GENERATING_MODELS.md b/tools/skqp/README_GENERATING_MODELS.md index d7afdd109c..a4b5b0b198 100644 --- a/tools/skqp/README_GENERATING_MODELS.md +++ b/tools/skqp/README_GENERATING_MODELS.md @@ -13,7 +13,7 @@ Skia][1]. Here is how that process works: Open the resulting URL in a browser and download the resulting `meta.json` file. - tools/skqp/sysopen.py $(tools/skqp/get_gold_export_url.py HEAD~10 HEAD) + bin/sysopen $(tools/skqp/get_gold_export_url.py HEAD~10 HEAD) 2. From a checkout of Skia's master branch, execute: @@ -36,7 +36,7 @@ Skia][1]. Here is how that process works: Review and submit the change: git push origin HEAD:refs/for/skqp/dev - tools/skqp/sysopen.py https://review.skia.org/$(bin/gerrit-number HEAD) + bin/sysopen https://review.skia.org/$(bin/gerrit-number HEAD) `tools/skqp/cut_release` diff --git a/tools/skqp/test_apk.sh b/tools/skqp/test_apk.sh index 1938f8816d..4a155d7b7a 100755 --- a/tools/skqp/test_apk.sh +++ b/tools/skqp/test_apk.sh @@ -69,17 +69,10 @@ adb pull "${ODIR}" "${TDIR}/${odir_basename}" REPORT="${TDIR}/${odir_basename}/report.html" -open_file() { - case "$(uname)" in - Linux) [ "$DISPLAY" ] && xdg-open "$@" > /dev/null 2>&1 & ;; - Darwin) open "$@" & ;; - esac -} - if [ -f "$REPORT" ]; then grep 'f(.*;' "$REPORT" echo "$REPORT" - open_file "$REPORT" + "$(dirname "$0")"/../../bin/sysopen "$REPORT" else echo "$TDIR" fi |