Mercurial > hg
annotate tests/test-check-clang-format.t @ 38679:b3d0c97a0820
rebase: in --confirm option just abort if hit a conflict
Before this patch, it was prompting the user in both cases 1) when
there is no conflict 2) when there is at least one conflict. But
for simplicity we can just abort if we hit a conflict and no need to
prompt in that case.
Differential Revision: https://phab.mercurial-scm.org/D3944
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sat, 14 Jul 2018 08:59:42 +0530 |
parents | 0024961aa493 |
children |
rev | line source |
---|---|
34834
2e8477059d4f
test-clang-format: new test to verify that files stay clang-formatted
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
1 #require clang-format test-repo |
2e8477059d4f
test-clang-format: new test to verify that files stay clang-formatted
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
2 |
2e8477059d4f
test-clang-format: new test to verify that files stay clang-formatted
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
3 $ . "$TESTDIR/helpers-testrepo.sh" |
2e8477059d4f
test-clang-format: new test to verify that files stay clang-formatted
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
4 |
2e8477059d4f
test-clang-format: new test to verify that files stay clang-formatted
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
5 $ cd "$TESTDIR"/.. |
37184
0024961aa493
contrib: rename clang-format-blacklist to clang-format-ignorelist
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35669
diff
changeset
|
6 $ for f in `testrepohg files 'set:(**.c or **.cc or **.h) and not "listfile:contrib/clang-format-ignorelist"'` ; do |
34834
2e8477059d4f
test-clang-format: new test to verify that files stay clang-formatted
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
7 > clang-format --style file $f > $f.formatted |
2e8477059d4f
test-clang-format: new test to verify that files stay clang-formatted
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
8 > cmp $f $f.formatted || diff -u $f $f.formatted |
2e8477059d4f
test-clang-format: new test to verify that files stay clang-formatted
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
9 > rm $f.formatted |
2e8477059d4f
test-clang-format: new test to verify that files stay clang-formatted
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
10 > done |