Mercurial > hg
comparison tests/test-graft.t @ 28033:0707bbec682d
tests: omit -p for external diff via extdiff extension for portability
Before this patch, some tests using external "diff" command via
extdiff extension fail on Solaris, because "-p" (show which C function
each change is in) option isn't supported by system standard "diff" on
Solaris, even though extdiff passes it to external "diff" by default.
Fortunately, this non-portable option isn't important for (current, at
least) tests using external "diff" command via extdiff extension.
This patch omits "-p" for external "diff" command via extdiff
extension for portability of tests, and adds check-code.py a rule to
detect invocation of "diff" with "-p".
Newly added check-code.py rule examines only lines generated by
external "diff" with "-r", because strict examination might
misidentify "hg diff -p" or other complicated lines consisting of
"diff" string as wrong one.
This patch is a part of making tests using external "diff" portable,
and tests below aren't yet portable even after this patch.
test-graft.t
test-largefiles-update.t
test-subrepo-deep-nested-change.t
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Mon, 08 Feb 2016 18:29:17 +0900 |
parents | 8abd9f785030 |
children | e7ff258f71df |
comparison
equal
deleted
inserted
replaced
28032:8157c6b82f40 | 28033:0707bbec682d |
---|---|
1 $ cat >> $HGRCPATH <<EOF | |
2 > [defaults] | |
3 > # for portability | |
4 > extdiff = --option -Nru | |
5 > EOF | |
6 | |
1 Create a repo with some stuff in it: | 7 Create a repo with some stuff in it: |
2 | 8 |
3 $ hg init a | 9 $ hg init a |
4 $ cd a | 10 $ cd a |
5 $ echo a > a | 11 $ echo a > a |