Chromium Code Reviews
|
|
Chromium Code Reviews
Issue
1555043003:
Convert DOS->Unix line endings for Dr memory exclude file. (Closed)
|
Created:
4 years, 11 months ago by kjellander_webrtc Modified:
4 years, 11 months ago Reviewers:
Taylor Brandstetter CC:
webrtc-reviews_webrtc.org Base URL:
https://chromium.googlesource.com/external/webrtc.git@master Target Ref:
refs/pending/heads/master Project:
webrtc Visibility:
Public. |
DescriptionConvert DOS->Unix line endings for Dr memory exclude file.
NOTRY=True
NOPRESUBMIT=True
TBR=deadbeef@webrtc.org
Committed: https://crrev.com/4138e08eb6dd8122bbf56b94fd4b45bf4ce91cf5
Cr-Commit-Position: refs/heads/master@{#11146}
Patch Set 1 #
Messages
Total messages: 18 (8 generated)
It seems you hit the one and only txt file that still had CR+LF line endings in
here: I did a recursive conversion using:
find tools/valgrind-webrtc -name "*.txt" -type f -exec dos2unix {} \;
and this file was the only one showing up.
With this landed, your tryjob for https://codereview.webrtc.org/1554673002
should patch properly.
Sorry about that.
The CQ bit was checked by kjellander@webrtc.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1555043003/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1555043003/1
On 2016/01/04 11:54:26, kjellander (webrtc) wrote:
> It seems you hit the one and only txt file that still had CR+LF line endings
in
> here: I did a recursive conversion using:
> find tools/valgrind-webrtc -name "*.txt" -type f -exec dos2unix {} \;
> and this file was the only one showing up.
>
> With this landed, your tryjob for https://codereview.webrtc.org/1554673002
> should patch properly.
> Sorry about that.
It's a known limitation of the trybots; see
https://www.chromium.org/developers/testing/try-server-usage (search for CRLF).
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: presubmit on tryserver.webrtc (JOB_FAILED, http://build.chromium.org/p/tryserver.webrtc/builders/presubmit/builds/2675)
Description was changed from ========== Convert DOS->Unix line endings for Dr memory exclude file. NOTRY=True TBR=deadbeef@webrtc.org ========== to ========== Convert DOS->Unix line endings for Dr memory exclude file. NOTRY=True NOPRESUBMIT=True TBR=deadbeef@webrtc.org ==========
On 2016/01/04 11:56:06, commit-bot: I haz the power wrote: > Try jobs failed on following builders: > presubmit on tryserver.webrtc (JOB_FAILED, > http://build.chromium.org/p/tryserver.webrtc/builders/presubmit/builds/2675) Ah, same issue here. Using NOPRESUBMIT=True to get this in then.
The CQ bit was checked by kjellander@webrtc.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1555043003/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1555043003/1
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for tools/valgrind-webrtc/gtest_exclude/system_wrappers_unittests.gtest-drmemory_win32.txt: While running git apply --index -3 -p1; error: patch failed: tools/valgrind-webrtc/gtest_exclude/system_wrappers_unittests.gtest-drmemory_win32.txt:1 Falling back to three-way merge... error: patch failed: tools/valgrind-webrtc/gtest_exclude/system_wrappers_unittests.gtest-drmemory_win32.txt:1 error: tools/valgrind-webrtc/gtest_exclude/system_wrappers_unittests.gtest-drmemory_win32.txt: patch does not apply Patch: tools/valgrind-webrtc/gtest_exclude/system_wrappers_unittests.gtest-drmemory_win32.txt Index: tools/valgrind-webrtc/gtest_exclude/system_wrappers_unittests.gtest-drmemory_win32.txt diff --git a/tools/valgrind-webrtc/gtest_exclude/system_wrappers_unittests.gtest-drmemory_win32.txt b/tools/valgrind-webrtc/gtest_exclude/system_wrappers_unittests.gtest-drmemory_win32.txt old mode 100755 new mode 100644 index 0bceb97c9ddda64ed3b9f1532ea0fbbedc6fda4e..304c9846f8cbbd5478e43693098d37243441e155 --- a/tools/valgrind-webrtc/gtest_exclude/system_wrappers_unittests.gtest-drmemory_win32.txt +++ b/tools/valgrind-webrtc/gtest_exclude/system_wrappers_unittests.gtest-drmemory_win32.txt @@ -1,3 +1,3 @@ -# https://code.google.com/p/webrtc/issues/detail?id=2330 -ClockTest.NtpTime - +# https://code.google.com/p/webrtc/issues/detail?id=2330 +ClockTest.NtpTime +
The CQ bit was unchecked by commit-bot@chromium.org
On 2016/01/04 11:57:07, commit-bot: I haz the power wrote: > Failed to apply patch for > tools/valgrind-webrtc/gtest_exclude/system_wrappers_unittests.gtest-drmemory_win32.txt: > While running git apply --index -3 -p1; > error: patch failed: > tools/valgrind-webrtc/gtest_exclude/system_wrappers_unittests.gtest-drmemory_win32.txt:1 > Falling back to three-way merge... > error: patch failed: > tools/valgrind-webrtc/gtest_exclude/system_wrappers_unittests.gtest-drmemory_win32.txt:1 > error: > tools/valgrind-webrtc/gtest_exclude/system_wrappers_unittests.gtest-drmemory_win32.txt: > patch does not apply > > Patch: > tools/valgrind-webrtc/gtest_exclude/system_wrappers_unittests.gtest-drmemory_win32.txt > Index: > tools/valgrind-webrtc/gtest_exclude/system_wrappers_unittests.gtest-drmemory_win32.txt > diff --git > a/tools/valgrind-webrtc/gtest_exclude/system_wrappers_unittests.gtest-drmemory_win32.txt > b/tools/valgrind-webrtc/gtest_exclude/system_wrappers_unittests.gtest-drmemory_win32.txt > old mode 100755 > new mode 100644 > index > 0bceb97c9ddda64ed3b9f1532ea0fbbedc6fda4e..304c9846f8cbbd5478e43693098d37243441e155 > --- > a/tools/valgrind-webrtc/gtest_exclude/system_wrappers_unittests.gtest-drmemory_win32.txt > +++ > b/tools/valgrind-webrtc/gtest_exclude/system_wrappers_unittests.gtest-drmemory_win32.txt > @@ -1,3 +1,3 @@ > -# https://code.google.com/p/webrtc/issues/detail?id=2330 > -ClockTest.NtpTime > - > +# https://code.google.com/p/webrtc/issues/detail?id=2330 > +ClockTest.NtpTime > + I guess I'll have to commit manually :)
Message was sent while issue was closed.
Description was changed from ========== Convert DOS->Unix line endings for Dr memory exclude file. NOTRY=True NOPRESUBMIT=True TBR=deadbeef@webrtc.org ========== to ========== Convert DOS->Unix line endings for Dr memory exclude file. NOTRY=True NOPRESUBMIT=True TBR=deadbeef@webrtc.org Committed: https://chromium.googlesource.com/external/webrtc/+/4138e08eb6dd8122bbf56b94f... ==========
Message was sent while issue was closed.
Committed patchset #1 (id:1) manually as 4138e08eb6dd8122bbf56b94fd4b45bf4ce91cf5 (presubmit successful).
Message was sent while issue was closed.
Description was changed from ========== Convert DOS->Unix line endings for Dr memory exclude file. NOTRY=True NOPRESUBMIT=True TBR=deadbeef@webrtc.org Committed: https://chromium.googlesource.com/external/webrtc/+/4138e08eb6dd8122bbf56b94f... ========== to ========== Convert DOS->Unix line endings for Dr memory exclude file. NOTRY=True NOPRESUBMIT=True TBR=deadbeef@webrtc.org Committed: https://crrev.com/4138e08eb6dd8122bbf56b94fd4b45bf4ce91cf5 Cr-Commit-Position: refs/heads/master@{#11146} ==========
Message was sent while issue was closed.
Patchset 1 (id:??) landed as https://crrev.com/4138e08eb6dd8122bbf56b94fd4b45bf4ce91cf5 Cr-Commit-Position: refs/heads/master@{#11146} |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
