diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 20:52:56 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 20:52:56 +0000 |
| commit | ba18686c2bbb0707fede09e2c1e3b33caafebdb1 (patch) | |
| tree | b12d31db36b8748adea1db936ddb849bd3b9dde3 /tools/emacs | |
| parent | 4a6d85644a21afb4d2bc10edf7808a23811b9004 (diff) | |
| download | chromium_src-ba18686c2bbb0707fede09e2c1e3b33caafebdb1.zip chromium_src-ba18686c2bbb0707fede09e2c1e3b33caafebdb1.tar.gz chromium_src-ba18686c2bbb0707fede09e2c1e3b33caafebdb1.tar.bz2 | |
emacs: also handle paths like "..\chrome/foo/bar" seen in build output
Test case amended to include example.
Review URL: http://codereview.chromium.org/6355015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72688 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/emacs')
| -rw-r--r-- | tools/emacs/trybot-windows.txt | 15 | ||||
| -rw-r--r-- | tools/emacs/trybot.el | 10 |
2 files changed, 24 insertions, 1 deletions
diff --git a/tools/emacs/trybot-windows.txt b/tools/emacs/trybot-windows.txt index e322368..b3ee27f 100644 --- a/tools/emacs/trybot-windows.txt +++ b/tools/emacs/trybot-windows.txt @@ -55,3 +55,18 @@ browser - 6 error(s), 0 warning(s) ---------------------- Done ----------------------
Build: 244 succeeded, 1 failed, 233 up-to-date, 42 skipped
+
+
+We also see weird paths with mixed slashes like this:
+
+--------------------Configuration: inspector_protocol_sources - Debug|Win32----
+--------------------Configuration: installer_util_nacl_win64 - Debug|x64-------
+Compiling...
+google_chrome_distribution_dummy.cc
+helper.cc
+installation_state.cc
+self_reg_work_item.cc
+..\chrome/installer/util/work_item.h(67) : error C2514: 'FilePath' : class has no constructors
+ ..\chrome/installer/util/work_item.h(26) : see declaration of 'FilePath'
+delete_tree_work_item.cc
+delete_reg_key_work_item.cc
diff --git a/tools/emacs/trybot.el b/tools/emacs/trybot.el index 2c65897..970ffc0 100644 --- a/tools/emacs/trybot.el +++ b/tools/emacs/trybot.el @@ -45,7 +45,15 @@ ; Fix Windows paths ("d:\...\src\"). (save-excursion - (while (re-search-forward "\\(^.:\\\\.*\\\\src\\\\\\)\\(.*?\\)[(:]" nil t) + ; This regexp is subtle and rather hard to read. :~( + ; Use regexp-builder when making changes to it. + (while (re-search-forward + (concat + ; First part: path leader, either of the form + ; e:\...src\ or ..\ + "\\(^.:\\\\.*\\\\src\\\\\\|\\.\\.\\\\\\)" + ; Second part: path, followed by error message marker. + "\\(.*?\\)[(:]") nil t) (replace-match "" nil t nil 1) ; Line now looks like: ; foo\bar\baz.cc error message here |