Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ticket32962 rebased #1667

Merged
merged 10 commits into from Jan 20, 2020
Merged

Ticket32962 rebased #1667

merged 10 commits into from Jan 20, 2020

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@teor2345 @coveralls @torproject-pusher @nmathewson
@teor2345
Copy link
Contributor

@teor2345 teor2345 commented Jan 15, 2020

No description provided.

nmathewson and others added 6 commits Jan 15, 2020
@nmathewson @teor2345
add_c_file: handle adding to the end of a list correctly.
ef1744e 
Fixes bug 32962.
@nmathewson @teor2345
add_c_file: tolerate ./ in filenames.
4f45ad1
@teor2345
add_c_file: Improve path handling and canonicalisation
207d262 
* distinguish between paths relative to the top-level tor directory,
  and paths relative to tor's src directory
* canonicalise paths before using them
* check that the script is run from the top-level tor directory
* check that the file is being created in tor's src directory

Part of 32962.
@teor2345
add_c_file: Document the paths used by each part of the script
3d50efc 
Most paths are relative to the top-level tor directory, but the
paths in the C and H files are relative to tor's src directory.

Part of 32962.
@teor2345
add_c_file: Simplify some usage of srcdir_file()
b828588 
Part of 32962.
@teor2345
add_c_file: Rename variables based on the type of path
eb336e2 
* fname for generic file paths
* tor_fname for paths relative to the top-level tor directory
* src_fname for paths relative to tor's src directory

With prefixes as required to disambiguate different paths of the same
type.

Part of 32962.
@coveralls
Copy link

@coveralls coveralls commented Jan 15, 2020 •
edited

Pull Request Test Coverage Report for Build 7822

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 3928 unchanged lines in 20 files lost coverage.
  • Overall coverage increased (+0.006%) to 63.324%
Files with Coverage Reduction New Missed Lines %
src/core/mainloop/mainloop.c 1 37.55%
src/feature/nodelist/nodelist.c 3 71.36%
src/feature/nodelist/fmt_routerstatus.c 12 82.35%
src/feature/dirauth/bwauth.c 15 89.53%
src/feature/dirauth/dirauth_config.c 25 80.0%
src/feature/dirauth/reachability.c 37 0%
src/feature/dirauth/shared_random.c 44 85.95%
src/feature/nodelist/microdesc.c 69 72.06%
src/feature/dircache/dirserv.c 72 72.07%
src/core/or/policies.c 96 87.48%
Totals Coverage Status
Change from base Build 7791: 0.006%
Covered Lines: 49939
Relevant Lines: 78863
💛 - Coveralls

teor2345 added 4 commits Jan 20, 2020
@teor2345
add_c_file: Improve tor source directory checks
0418bc0 
Check that the script isn't in a tor build directory, by looking
for a src/include.am file.

Part of 32962.
@teor2345
add_c_file: Improve script documentation
2c75d4a 
Part of 32962.
@teor2345
add_c_file: Replace asserts with exceptions
28c8c63 
Closes 32962.
@teor2345
add_c_file: Fix "control line not preceded by a blank line"
5ad1efa 
Fix dirauth and relay module include.am add_c_file.py
"control line not preceded by a blank line" errors.

Also remove a duplicate ADD_C_FILE: SOURCES in the relay module.

Obviously correct fixes to already-reviewed code.
@torproject-pusher torproject-pusher merged commit 5ad1efa into torproject:master Jan 20, 2020
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment