* Re: [Emacs-diffs] emacs-25 c71e1e8: Use short date for 'hg annotate', and output the author
[not found] ` <E1aI4Z8-0003Pe-CW@vcs.savannah.gnu.org>
@ 2016-01-10 17:40 ` Ken Brown
2016-01-11 19:58 ` Ken Brown
0 siblings, 1 reply; 3+ messages in thread
From: Ken Brown @ 2016-01-10 17:40 UTC (permalink / raw)
To: emacs-devel, Dmitry Gutov
On 1/9/2016 8:13 PM, Dmitry Gutov wrote:
> +(ert-deftest vc-hg-annotate-extract-revision-at-line-with-filename ()
> + ;; with filename
> + (with-temp-buffer
> + (save-excursion (insert "215 2007-06-20 CONTENTS:"))
> + (should (equal (vc-hg-annotate-extract-revision-at-line)
> + (cons
> + "215"
> + (expand-file-name "test/automated/CONTENTS"
> + source-directory))))))
> +
[...]
> +(ert-deftest vc-hg-annotate-extract-revision-at-line-with-both ()
> + (with-temp-buffer
> + (save-excursion (insert "philringnalda 218075 2014-11-28 CLOBBER:"))
> + (should (equal (vc-hg-annotate-extract-revision-at-line)
> + (cons
> + "218075"
> + (expand-file-name "test/automated/CLOBBER"
> + source-directory))))))
These two tests fail on an out-of-tree build.
Ken
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Emacs-diffs] emacs-25 c71e1e8: Use short date for 'hg annotate', and output the author
2016-01-10 17:40 ` [Emacs-diffs] emacs-25 c71e1e8: Use short date for 'hg annotate', and output the author Ken Brown
@ 2016-01-11 19:58 ` Ken Brown
2016-01-11 21:18 ` Dmitry Gutov
0 siblings, 1 reply; 3+ messages in thread
From: Ken Brown @ 2016-01-11 19:58 UTC (permalink / raw)
To: emacs-devel, Dmitry Gutov
On 1/10/2016 12:40 PM, Ken Brown wrote:
> On 1/9/2016 8:13 PM, Dmitry Gutov wrote:
>> +(ert-deftest vc-hg-annotate-extract-revision-at-line-with-filename ()
>> + ;; with filename
>> + (with-temp-buffer
>> + (save-excursion (insert "215 2007-06-20 CONTENTS:"))
>> + (should (equal (vc-hg-annotate-extract-revision-at-line)
>> + (cons
>> + "215"
>> + (expand-file-name "test/automated/CONTENTS"
>> + source-directory))))))
>> +
>
> [...]
>
>> +(ert-deftest vc-hg-annotate-extract-revision-at-line-with-both ()
>> + (with-temp-buffer
>> + (save-excursion (insert "philringnalda 218075 2014-11-28 CLOBBER:"))
>> + (should (equal (vc-hg-annotate-extract-revision-at-line)
>> + (cons
>> + "218075"
>> + (expand-file-name "test/automated/CLOBBER"
>> + source-directory))))))
>
> These two tests fail on an out-of-tree build.
How about the following fix:
diff --git a/test/automated/vc-hg.el b/test/automated/vc-hg.el
index 6828271..76ba785 100644
--- a/test/automated/vc-hg.el
+++ b/test/automated/vc-hg.el
@@ -34,8 +34,8 @@
(should (equal (vc-hg-annotate-extract-revision-at-line)
(cons
"215"
- (expand-file-name "test/automated/CONTENTS"
- source-directory))))))
+ (expand-file-name "CONTENTS"
+ default-directory))))))
(ert-deftest vc-hg-annotate-extract-revision-at-line-with-user ()
(with-temp-buffer
@@ -49,8 +49,8 @@
(should (equal (vc-hg-annotate-extract-revision-at-line)
(cons
"218075"
- (expand-file-name "test/automated/CLOBBER"
- source-directory))))))
+ (expand-file-name "CLOBBER"
+ default-directory))))))
(ert-deftest vc-hg-annotate-time ()
(with-temp-buffer
Ken
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-01-11 21:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20160110011306.13084.71282@vcs.savannah.gnu.org>
[not found] ` <E1aI4Z8-0003Pe-CW@vcs.savannah.gnu.org>
2016-01-10 17:40 ` [Emacs-diffs] emacs-25 c71e1e8: Use short date for 'hg annotate', and output the author Ken Brown
2016-01-11 19:58 ` Ken Brown
2016-01-11 21:18 ` Dmitry Gutov
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.