740227 - Add TPS and TPS tests to make package-tests

Status: RESOLVED FIXED

(Testing Graveyard :: TPS, defect)

Description

[Jonathan Griffin (:jgriffin)]

In order to allow us to use the correct version of TPS and TPS tests when running TPS against on-commit builds in continuous integration, we should add both TPS and TPS tests to make package-tests, so we can download them in the tests bundle that corresponds to the build being tested.

Comment 1

[Jonathan Griffin (:jgriffin)]

Attachment: patch

Comment 2

[(not currently active) Ted Mielczarek]

Comment on attachment 611654 [details] [diff] [review]
patch

Review of attachment 611654 [details] [diff] [review]:
-----------------------------------------------------------------

You should push this to try (once you've fixed it), then you can verify that the test packages contain what you expect.

::: testing/testsuite-targets.mk
@@ +290,4 @@
>  
>  ifndef UNIVERSAL_BINARY
>  PKG_STAGE = $(DIST)/test-package-stage
> +package-tests: stage-mochitest stage-reftest stage-xpcshell stage-jstests stage-jetpack stage-firebug stage-peptest stage-mozbase stage-tps

This list is getting kind of long. Can you reformat it with line continuations while you're here, like
package-tests: \
  stage-mochitest \
  ...
  stage-tps \
  $(NULL)
(note two-space indent)

@@ +346,5 @@
>  
> +stage-tps: make-stage-dir
> +	$(NSINSTALL) $(topsrcdir)/testing/tps $(PKG_STAGE)/tps
> +	$(NSINSTALL) $(topsrcdir)/services/sync/tps/extensions $(PKG_STAGE)/tps
> +	$(NSINSTALL) $(topsrcdir)/services/sync/tests/tps $(PKG_STAGE)/tps/tests

So uh, nsinstall doesn't work to recursively install directories on Windows. Sorry! If you look at how the other test suites package themselves you can copy/paste that code. It's mostly just using tar|untar to work around this.

@@ +363,4 @@
>    xpcshell-tests \
>    jstestbrowser \
>    peptest \
> +  package-tests make-stage-dir stage-mochitest stage-reftest stage-xpcshell stage-jstests stage-android stage-jetpack stage-firebug stage-peptest stage-mozbase stage-tps

These should probably be reformatted too.

Comment 3

[Jonathan Griffin (:jgriffin)]

Attachment: patch v0.2

Comment 4

[Mozilla RelEng Bot]

Try run for 6af3bdca2106 is complete.
Detailed breakdown of the results available here:
    https://tbpl.mozilla.org/?tree=Try&rev=6af3bdca2106
Results (out of 15 total builds):
    success: 13
    warnings: 2
Builds (or logs if builds failed) available at:
http://ftp.mozilla.org/pub/mozilla.org/firefox/try-builds/[e-mail]-6af3bdca2106

Comment 5

[Mozilla RelEng Bot]

Autoland Patchset:
	Patches: 612669
	Branch: mozilla-central => try
	Destination: http://hg.mozilla.org/try/pushloghtml?changeset=775abd2769dc
Try run started, revision 775abd2769dc. To cancel or monitor the job, see: https://tbpl.mozilla.org/?tree=Try&rev=775abd2769dc

Comment 6

[Jonathan Griffin (:jgriffin)]

Comment on attachment 612669 [details] [diff] [review]
patch v0.2

Try test packages in the try runs were all as expected.

Comment 7

[(not currently active) Ted Mielczarek]

Comment on attachment 612669 [details] [diff] [review]
patch v0.2

Review of attachment 612669 [details] [diff] [review]:
-----------------------------------------------------------------

r=me with one change

::: testing/testsuite-targets.mk
@@ +290,5 @@
>  
>  ifndef UNIVERSAL_BINARY
>  PKG_STAGE = $(DIST)/test-package-stage
> +package-tests: \
> +	stage-mochitest \

two-space indent here, not tabs.

Comment 8

[Jonathan Griffin (:jgriffin)]

http://hg.mozilla.org/integration/mozilla-inbound/rev/28485be3fd5c

Comment 9

[(no longer active)]

https://hg.mozilla.org/mozilla-central/rev/28485be3fd5c

Comment 10

[Mozilla RelEng Bot]

Try run for 775abd2769dc is complete.
Detailed breakdown of the results available here:
    https://tbpl.mozilla.org/?tree=Try&rev=775abd2769dc
Results (out of 15 total builds):
    success: 13
    warnings: 2
Builds (or logs if builds failed) available at:
http://ftp.mozilla.org/pub/mozilla.org/firefox/try-builds/[e-mail]-775abd2769dc
 Timed out after 12 hours without completing.