summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-07-06 09:30:40 -0400
committerNick Mathewson <nickm@torproject.org>2017-07-06 09:30:40 -0400
commit720552b04c86e1b823d12bfde71ba052f4246e1c (patch)
treefaed9a62b48bd1b8fecea4255fd6dbc578429e0e
parent139799cdceadafd8dbbc54fb73bfa91179489b58 (diff)
parent24d29c7ae0c523da7d59495438bbea10114da5e1 (diff)
downloadtor-720552b04c86e1b823d12bfde71ba052f4246e1c.tar.gz
tor-720552b04c86e1b823d12bfde71ba052f4246e1c.zip
Merge remote-tracking branch 'chelseakomlo/coding-standards-22762'
-rw-r--r--doc/HACKING/CodingStandards.md7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/HACKING/CodingStandards.md b/doc/HACKING/CodingStandards.md
index c7787a72cc..da8ce62f5e 100644
--- a/doc/HACKING/CodingStandards.md
+++ b/doc/HACKING/CodingStandards.md
@@ -6,7 +6,7 @@ tl;dr:
- Run configure with `--enable-fatal-warnings`
- Document your functions
- Write unit tests
- - Run `make test-full` to test against all unit and integration tests.
+ - Run `make check` before submitting a patch
- Run `make distcheck` to ensure the distribution works
- Add a file in `changes` for your branch.
@@ -32,6 +32,11 @@ Did you remember...
- To base your code on the appropriate branch?
- To include a file in the `changes` directory as appropriate?
+If you are submitting a major patch or new feature, or want to in the future...
+
+ - Set up Chutney and Stem, see HACKING/WritingTests.md
+ - Run `make test-full` to test against all unit and integration tests.
+
How we use Git branches
=======================