tools/tests/run.sh - Issue 23899003: rebaseline.py: fix --add-new when there are no expectations at all

Side by Side Diff: tools/tests/run.sh

Issue 23899003: rebaseline.py: fix --add-new when there are no expectations at all (Closed) Base URL: http://skia.googlecode.com/svn/trunk/

Patch Set: rebase_to_r11062 Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « tools/tests/rebaseline/output/using-json1-expectations/output-expected/gm-expectations/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/expected-results.json ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 #!/bin/bash	1 #!/bin/bash

2	2

3 # Tests for our tools.	3 # Tests for our tools.

4 #	4 #

5 # TODO: currently, this only passes on Linux (which is the platform that	5 # TODO: currently, this only passes on Linux (which is the platform that

6 # the housekeeper bot runs on, e.g.	6 # the housekeeper bot runs on, e.g.

7 # http://70.32.156.51:10117/builders/Skia_PerCommit_House_Keeping/builds/1415/st eps/RunToolSelfTests/logs/stdio )	7 # http://70.32.156.51:10117/builders/Skia_PerCommit_House_Keeping/builds/1415/st eps/RunToolSelfTests/logs/stdio )

8 # See https://code.google.com/p/skia/issues/detail?id=677	8 # See https://code.google.com/p/skia/issues/detail?id=677

9 # ('make tools/tests/run.sh work cross-platform')	9 # ('make tools/tests/run.sh work cross-platform')

10 # Ideally, these tests should pass on all development platforms...	10 # Ideally, these tests should pass on all development platforms...

(...skipping 226 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
237 fi	237 fi

238	238

239 #	239 #

240 # Test rebaseline.py ...	240 # Test rebaseline.py ...

241 #	241 #

242	242

243 REBASELINE_INPUT=tools/tests/rebaseline/input	243 REBASELINE_INPUT=tools/tests/rebaseline/input

244 REBASELINE_OUTPUT=tools/tests/rebaseline/output	244 REBASELINE_OUTPUT=tools/tests/rebaseline/output

245 rebaseline_test "$REBASELINE_INPUT/json1" "--actuals-base-url $REBASELINE_INPUT/ json1 --builders Test-Android-GalaxyNexus-SGX540-Arm7-Debug Test-Win7-ShuttleA-H D2000-x86-Release" "$REBASELINE_OUTPUT/using-json1-expectations"	245 rebaseline_test "$REBASELINE_INPUT/json1" "--actuals-base-url $REBASELINE_INPUT/ json1 --builders Test-Android-GalaxyNexus-SGX540-Arm7-Debug Test-Win7-ShuttleA-H D2000-x86-Release" "$REBASELINE_OUTPUT/using-json1-expectations"

246 rebaseline_test "$REBASELINE_INPUT/json1" "--actuals-base-url $REBASELINE_INPUT/ json1 --bugs 1234 5678 --builders Test-Android-GalaxyNexus-SGX540-Arm7-Debug Tes t-Win7-ShuttleA-HD2000-x86-Release --notes notes_content --unreviewed" "$REBASEL INE_OUTPUT/marked-unreviewed"	246 rebaseline_test "$REBASELINE_INPUT/json1" "--actuals-base-url $REBASELINE_INPUT/ json1 --bugs 1234 5678 --builders Test-Android-GalaxyNexus-SGX540-Arm7-Debug Tes t-Win7-ShuttleA-HD2000-x86-Release --notes notes_content --unreviewed" "$REBASEL INE_OUTPUT/marked-unreviewed"

	247 rebaseline_test "$REBASELINE_INPUT/json1" "--actuals-base-url $REBASELINE_INPUT/ json1 --add-new --builders Test-Android-GalaxyNexus-SGX540-Arm7-Debug Test-Mac10 .6-MacMini4.1-GeForce320M-x86-Release Test-Win7-ShuttleA-HD2000-x86-Release" "$R EBASELINE_OUTPUT/add-new"

247	248

248 #	249 #

249 # Test jsondiff.py ...	250 # Test jsondiff.py ...

250 #	251 #

251	252

252 JSONDIFF_INPUT=tools/tests/jsondiff/input	253 JSONDIFF_INPUT=tools/tests/jsondiff/input

253 JSONDIFF_OUTPUT=tools/tests/jsondiff/output	254 JSONDIFF_OUTPUT=tools/tests/jsondiff/output

254 jsondiff_test "$JSONDIFF_INPUT/old.json $JSONDIFF_INPUT/new.json" "$JSONDIFF_OUT PUT/old-vs-new"	255 jsondiff_test "$JSONDIFF_INPUT/old.json $JSONDIFF_INPUT/new.json" "$JSONDIFF_OUT PUT/old-vs-new"

255	256

256	257

257 echo "All tests passed."	258 echo "All tests passed."

OLD	NEW