821425 - Remote CPP unit tests: pass environment variables

Status: RESOLVED FIXED

(Testing :: General, defect)

Description

[Geoff Brown [:gbrown]]

It should be possible to modify the environment variables used when running remote cpp unit tests. Some defaults are set by remotecppunittests.py and cppunittests.py, but certain tests may require special modifications.

Comment 1

[Geoff Brown [:gbrown]]

See https://bugzilla.mozilla.org/show_bug.cgi?id=821033#c4 for motivation.

Comment 2

[Geoff Brown [:gbrown]]

Attachment: provide --addEnv option for remotecppunittests.py

This adds a --addEnv option to remotecppunittests.py. --addEnv takes a string argument that should be of the form "envvar=value". The option may be repeated.

This way you can do something like:

export EXTRA_TEST_ARGS="--addEnv myvar1=myval1 --addEnv myvar2=myval2"
make cppunittests-remote

Each specified environment variable is passed to the remote execution environment. A variable specified with --addEnv using the same variable name as a well-known variable (like TMPDIR) over-writes the well-known default. "--addEnv myvar=" (or "--addEnv myvar") is allowed so that well-known env variables defined by cppunittests.py or remotecppunittests.py may be cleared.

Comment 3

[Joel Maher ( :jmaher ) (UTC -8)]

Comment on attachment 692442 [details] [diff] [review]
provide --addEnv option for remotecppunittests.py

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

::: testing/remotecppunittests.py
@@ +165,5 @@
>          defaults["remoteTestRoot"] = "/data/local/tests"
>  
> +        self.add_option("--addEnv", action = "append",
> +                    type = "string", dest = "addEnv",
> +                    help = "additional remote environment variable definitions")

can you put an example of what this would look like?  --addEnv="myenvvar=true" or something like that.

Comment 4

[Geoff Brown [:gbrown]]

Attachment: provide --addEnv option for remotecppunittests.py

Added example to option help as per review comment. r=jmaher

Comment 5

[Dan Mosedale (:dmosedale, :dmose)]

The patch here seems to be against a previous patch or script that contains a "remoteTestRoot" clause.  None of the patches that I can find in other bugs have that, so I had to massage this by hand to make it apply.

Comment 6

[Dan Mosedale (:dmosedale, :dmose)]

Attachment: version of the patch that applies to my patch stack

Comment 7

[Geoff Brown [:gbrown]]

Attachment: provide --addEnv option for remotecppunittests.py

:dmose -- sorry about that! You need a patch queue like this:

bug 811411
bug 821033
bug 821590
bug 824274
bug 821425
bug 821424

...even so, this patch had bitrotted -- updated now.

Comment 8

[Dan Mosedale (:dmosedale, :dmose)]

That fixed things up nicely; thanks!

Comment 9

[Geoff Brown [:gbrown]]

Attachment: provide --addEnv option for remotecppunittests.py

Re-based for new patch on bug 811411.

Comment 10

[Geoff Brown [:gbrown]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/05cfc19ac6e1

Comment 11

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/05cfc19ac6e1