Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(520)

Issue 6539001: Merge remote branch 'cros/upstream' into master. (Closed)

Created:
9 years, 10 months ago by ericli
Modified:
9 years, 7 months ago
CC:
chromium-os-reviews_chromium.org, truty+cc_chromium.org, sosa+cc_chromium.org, seano+cc_chromium.org, petkov+cc_chromium.org
Visibility:
Public.

Description

Merge remote branch 'cros/upstream' into master. Merged to upstream autotest @5216~@5235. Most of the stuff are from Olof's arm cross compiling and some misc changes from Dale Curtis. As usual,the entire change list description is too big to enlist here. Please refer to upstream (http://autotest.kernel.org/browser) for more details. BUG=none TEST=1. emerge-arm-generic autotest autotest-deps autotest-tests 2. emerge-x86-generic autotest autotest-deps autotest-tests 3. run bvt from both src/third_party and inside emerged chroot/..usr/local/autotest. Seems fine. No regression found. Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=8a12e80

Patch Set 1 #

Patch Set 2 : patch #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1692 lines, -859 lines) Patch
M cli/job.py View 4 chunks +9 lines, -8 lines 0 comments Download
M cli/job_unittest.py View 2 chunks +31 lines, -0 lines 0 comments Download
M client/bin/autotest View 1 chunk +3 lines, -0 lines 0 comments Download
M client/bin/base_utils.py View 1 chunk +7 lines, -0 lines 0 comments Download
M client/bin/harness.py View 2 chunks +2 lines, -2 lines 0 comments Download
M client/bin/harness_ABAT.py View 1 chunk +1 line, -1 line 0 comments Download
M client/bin/harness_autoserv.py View 1 chunk +1 line, -1 line 0 comments Download
M client/bin/harness_simple.py View 1 chunk +1 line, -1 line 0 comments Download
M client/bin/harness_standalone.py View 1 chunk +1 line, -1 line 0 comments Download
M client/bin/harness_unittest.py View 3 chunks +9 lines, -6 lines 0 comments Download
M client/bin/job.py View 4 chunks +47 lines, -33 lines 0 comments Download
M client/bin/job_unittest.py View 5 chunks +9 lines, -3 lines 0 comments Download
M client/common_lib/base_packages.py View 1 chunk +4 lines, -2 lines 0 comments Download
M client/common_lib/hosts/base_classes.py View 1 chunk +3 lines, -2 lines 0 comments Download
M client/tests/bash_shared_mapping/bash_shared_mapping.py View 1 chunk +1 line, -0 lines 0 comments Download
M client/tests/fsfuzzer/fsfuzzer.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/fsstress/fsstress.py View 1 chunk +1 line, -0 lines 0 comments Download
M client/tests/interbench/interbench.py View 1 chunk +1 line, -0 lines 0 comments Download
M client/tests/iozone/iozone.py View 1 chunk +1 line, -0 lines 0 comments Download
M client/tests/kvm/control View 3 chunks +14 lines, -14 lines 0 comments Download
M client/tests/kvm/control.parallel View 2 chunks +5 lines, -7 lines 0 comments Download
M client/tests/kvm/kvm_config.py View 3 chunks +531 lines, -593 lines 0 comments Download
M client/tests/kvm/kvm_preprocessing.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/kvm_scheduler.py View 4 chunks +4 lines, -5 lines 0 comments Download
M client/tests/kvm/kvm_utils.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/scripts/virtio_console_guest.py View 12 chunks +69 lines, -27 lines 0 comments Download
M client/tests/kvm/tests.cfg.sample View 4 chunks +6 lines, -7 lines 0 comments Download
M client/tests/kvm/tests/virtio_console.py View 30 chunks +437 lines, -96 lines 0 comments Download
M client/tests/kvm/tests_base.cfg.sample View 20 chunks +20 lines, -27 lines 0 comments Download
M client/tests/linus_stress/linus_stress.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/lmbench/lmbench.py View 1 chunk +2 lines, -0 lines 0 comments Download
M client/tests/memory_api/memory_api.py View 1 chunk +7 lines, -4 lines 0 comments Download
M client/tests/rmaptest/rmaptest.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/signaltest/src/Makefile View 1 chunk +4 lines, -5 lines 0 comments Download
M client/tests/tiobench/tiobench.py View 1 chunk +1 line, -1 line 0 comments Download
A client/tests/wb_kupdate/README View 1 chunk +9 lines, -0 lines 0 comments Download
A client/tests/wb_kupdate/common.py View 1 chunk +8 lines, -0 lines 0 comments Download
A client/tests/wb_kupdate/control View 1 chunk +44 lines, -0 lines 0 comments Download
A client/tests/wb_kupdate/wb_kupdate.py View 1 chunk +269 lines, -0 lines 0 comments Download
A client/tests/wb_kupdate/wb_kupdate_unittest.py View 1 chunk +105 lines, -0 lines 0 comments Download
M client/tools/autotest View 1 chunk +0 lines, -1 line 0 comments Download
M database/schema_051.sql View 5 chunks +5 lines, -5 lines 0 comments Download
M frontend/afe/frontend_test_utils.py View 1 chunk +3 lines, -0 lines 0 comments Download
M frontend/afe/resources_test.py View 1 chunk +8 lines, -0 lines 0 comments Download
M frontend/frontend_unittest.py View 1 chunk +2 lines, -0 lines 0 comments Download
M server/crashcollect.py View 1 chunk +2 lines, -2 lines 0 comments Download

Messages

Total messages: 7 (0 generated)
ericli
As usual, early review as testing is still undergoing. I will update test stanza after ...
9 years, 10 months ago (2011-02-17 01:22:58 UTC) #1
DaleCurtis
Everything looks fine for my changes and in anything that might affect us. On 2011/02/17 ...
9 years, 10 months ago (2011-02-17 01:27:31 UTC) #2
ericli
Hold on, seems like all your makefile.patch files were not properly patched into upstream. In ...
9 years, 10 months ago (2011-02-17 17:40:29 UTC) #3
ericli
I have talked with the upstream committer and he forgot the svn add all makefile.patches. ...
9 years, 10 months ago (2011-02-17 19:42:19 UTC) #4
DaleCurtis
LGTM unless olof has any objections. On 2011/02/17 19:42:19, ericli wrote: > I have talked ...
9 years, 10 months ago (2011-02-17 22:07:20 UTC) #5
Olof Johansson
If there is no delta between my CLs and this code, than this is fine ...
9 years, 10 months ago (2011-02-17 22:18:23 UTC) #6
ericli
9 years, 10 months ago (2011-02-17 22:23:10 UTC) #7
Alright, I will take this as an LTGM from you. And I will keep talking with you
for other follow-up changes.

Thanks.

On 2011/02/17 22:18:23, Olof Johansson wrote:
> If there is no delta between my CLs and this code, than this is fine with me.
> It's hard to tell since it was all balled together.
> 
> 
> -Olof
> 
> On 2011/02/17 22:07:20, dalec wrote:
> > LGTM unless olof has any objections.
> > 
> > On 2011/02/17 19:42:19, ericli wrote:
> > > I have talked with the upstream committer and he forgot the svn add all
> > > makefile.patches. And he will make it up today.
> > > 
> > > In the mean time, I had tested:
> > > 1. emerge-arm-generic autotest autotest-deps autotest-tests
> > > 2. emerge-x86-generic autotest autotest-deps autotest-tests
> > > 3. run bvt from both src/third_party and inside emerged
> > > chroot/..usr/local/autotest.
> > > Seems fine.
> > > 
> > > There is no regression found, and of cause, olof's cross compiling test
> cases
> > > would not work for now, but since they are not in our default pre-build
test
> > > lists, I assume it should be OK.
> > > 
> > > I am still intend to push this CL in so I could unblock some of Dale's
> pending
> > > work. Would like to seek a LGTM from both of you guys if are OK with my
> > > proposal.

Powered by Google App Engine
This is Rietveld 408576698