gm/tests/run.sh - Issue 12632015: Make gm use SkFlags.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gm/tests/run.sh

Issue 12632015: Make gm use SkFlags. (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: update command_line Created 7 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« gm/tests/outputs/compared-against-different-pixels-images/output-expected/command_line ('K') | « gm/tests/outputs/no-readpath/output-expected/command_line ('k') | gyp/flags.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gm/tests/run.sh

diff --git a/gm/tests/run.sh b/gm/tests/run.sh

index 840fefeab101f4c2f5fdc5bac711cc583efdd731..d7da1d3ca8ff9f06ee3df1cd9344a62d9d49f770 100755

--- a/gm/tests/run.sh

+++ b/gm/tests/run.sh

@@ -21,7 +21,7 @@ GM_BINARY=out/Debug/gm

OUTPUT_ACTUAL_SUBDIR=output-actual

OUTPUT_EXPECTED_SUBDIR=output-expected

-CONFIGS="--config 8888 --config 565"

+CONFIGS="--config 8888 565"

# Compare contents of all files within directories $1 and $2,

# EXCEPT for any dotfiles.

@@ -58,7 +58,7 @@ function gm_test {

rm -rf $ACTUAL_OUTPUT_DIR

mkdir -p $ACTUAL_OUTPUT_DIR

- COMMAND="$GM_BINARY $GM_ARGS --writeJsonSummary $JSON_SUMMARY_FILE"

+ COMMAND="$GM_BINARY $GM_ARGS --writeJsonSummaryPath $JSON_SUMMARY_FILE"

echo "$COMMAND" >$ACTUAL_OUTPUT_DIR/command_line

$COMMAND >$ACTUAL_OUTPUT_DIR/stdout 2>$ACTUAL_OUTPUT_DIR/stderr

echo $? >$ACTUAL_OUTPUT_DIR/return_value

@@ -100,7 +100,7 @@ function create_inputs_dir {

# Run GM again to read in those images and write them out as a JSON summary.

$GM_BINARY --hierarchy --match selftest1 $CONFIGS \

-r $IMAGES_DIR/identical-bytes \

- --writeJsonSummary $JSON_DIR/identical-bytes.json

+ --writeJsonSummaryPath $JSON_DIR/identical-bytes.json

mkdir -p $IMAGES_DIR/identical-pixels

$GM_BINARY --hierarchy --match selftest1 $CONFIGS \

@@ -111,7 +111,7 @@ function create_inputs_dir {

>> $IMAGES_DIR/identical-pixels/565/selftest1.png

$GM_BINARY --hierarchy --match selftest1 $CONFIGS \

-r $IMAGES_DIR/identical-pixels \

- --writeJsonSummary $JSON_DIR/identical-pixels.json

+ --writeJsonSummaryPath $JSON_DIR/identical-pixels.json

mkdir -p $IMAGES_DIR/different-pixels

$GM_BINARY --hierarchy --match selftest2 $CONFIGS \

@@ -122,7 +122,7 @@ function create_inputs_dir {

$IMAGES_DIR/different-pixels/565/selftest1.png

$GM_BINARY --hierarchy --match selftest1 $CONFIGS \

-r $IMAGES_DIR/different-pixels \

- --writeJsonSummary $JSON_DIR/different-pixels.json

+ --writeJsonSummaryPath $JSON_DIR/different-pixels.json

mkdir -p $IMAGES_DIR/empty-dir

}