Upstream the android python scripts changes that enable the new Forwarder2 to be used in our test f…

Upstream the android python scripts changes that enable the new Forwarder2 to be used in our test framework.

BUG=146502
content/ changes are trivial so I am adding a TBR.
TBR=avi


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=162150

[bulach, 2012-10-15 19:31:55]

lgtm, thanks felipe!

just nits below..

http://codereview.chromium.org/11148018/diff/1/build/android/pylib/base_test_...
File build/android/pylib/base_test_runner.py (right):

http://codereview.chromium.org/11148018/diff/1/build/android/pylib/base_test_...
build/android/pylib/base_test_runner.py:73: Test results returned from
RunTests(). TODO(tonyg): It looks like
I think we should remove this todo (and from downstream as well, I guess this
has been sorted..)

http://codereview.chromium.org/11148018/diff/1/build/android/pylib/run_java_t...
File build/android/pylib/run_java_tests.py (right):

http://codereview.chromium.org/11148018/diff/1/build/android/pylib/run_java_t...
build/android/pylib/run_java_tests.py:43: # TODO(jaydeepmehta): FilterTests
should be moved to a common file for
ditto..

http://codereview.chromium.org/11148018/diff/1/build/android/pylib/run_java_t...
build/android/pylib/run_java_tests.py:364: # TODO(tonyg): Is there an error log
line to watch for here?
ditto..

http://codereview.chromium.org/11148018/diff/1/tools/android/forwarder2/socke...
File tools/android/forwarder2/socket.cc (right):

http://codereview.chromium.org/11148018/diff/1/tools/android/forwarder2/socke...
tools/android/forwarder2/socket.cc:229: const int flags = fcntl(socket_,
F_GETFL);
nit: kFlags

[Yaron, 2012-10-15 20:36:27]

lgtm

You can tbr the trivial content/ change

[Philippe, 2012-10-16 10:05:41]

http://codereview.chromium.org/11148018/diff/1/tools/android/forwarder2/host_...
File tools/android/forwarder2/host_forwarder_main.cc (right):

http://codereview.chromium.org/11148018/diff/1/tools/android/forwarder2/host_...
tools/android/forwarder2/host_forwarder_main.cc:42: exit(-1);
As we discussed in https://chromiumcodereview.appspot.com/11038005/ (which
hasn't landed?), this should be 1 rather than -1.

http://codereview.chromium.org/11148018/diff/1/tools/android/forwarder2/host_...
tools/android/forwarder2/host_forwarder_main.cc:97: return -1;
Same here.

[felipeg, 2012-10-16 14:11:44]

http://codereview.chromium.org/11148018/diff/1/build/android/pylib/base_test_...
File build/android/pylib/base_test_runner.py (right):

http://codereview.chromium.org/11148018/diff/1/build/android/pylib/base_test_...
build/android/pylib/base_test_runner.py:73: Test results returned from
RunTests(). TODO(tonyg): It looks like
On 2012/10/15 19:31:55, bulach wrote:
> I think we should remove this todo (and from downstream as well, I guess this
> has been sorted..)

Done.

http://codereview.chromium.org/11148018/diff/1/build/android/pylib/run_java_t...
File build/android/pylib/run_java_tests.py (right):

http://codereview.chromium.org/11148018/diff/1/build/android/pylib/run_java_t...
build/android/pylib/run_java_tests.py:43: # TODO(jaydeepmehta): FilterTests
should be moved to a common file for
On 2012/10/15 19:31:55, bulach wrote:
> ditto..

Done.

http://codereview.chromium.org/11148018/diff/1/build/android/pylib/run_java_t...
build/android/pylib/run_java_tests.py:364: # TODO(tonyg): Is there an error log
line to watch for here?
On 2012/10/15 19:31:55, bulach wrote:
> ditto..

Done.

http://codereview.chromium.org/11148018/diff/1/tools/android/forwarder2/socke...
File tools/android/forwarder2/socket.cc (right):

http://codereview.chromium.org/11148018/diff/1/tools/android/forwarder2/socke...
tools/android/forwarder2/socket.cc:229: const int flags = fcntl(socket_,
F_GETFL);
On 2012/10/15 19:31:55, bulach wrote:
> nit: kFlags

Done.

[felipeg, 2012-10-16 14:13:45]

http://codereview.chromium.org/11148018/diff/1/tools/android/forwarder2/host_...
File tools/android/forwarder2/host_forwarder_main.cc (right):

http://codereview.chromium.org/11148018/diff/1/tools/android/forwarder2/host_...
tools/android/forwarder2/host_forwarder_main.cc:97: return -1;
On 2012/10/16 10:05:41, Philippe wrote:
> Same here.

Done.

[Philippe, 2012-10-16 14:21:03]

lgtm, thanks Felipe!

[commit-bot: I haz the power, 2012-10-16 14:55:13]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/felipeg@chromium.org/11148018/13001

[commit-bot: I haz the power, 2012-10-16 17:16:49]

Change committed as 162150