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

Fix incorrect OpenBSD macro tests (this fixes a testsuite failure) #619

Closed
wants to merge 2 commits into from
Closed

Conversation

Labels
None yet
Projects
None yet
3 participants
@rettakjak
Copy link
Contributor

@rettakjak rettakjak commented Dec 23, 2018

Trac ticket: https://trac.torproject.org/projects/tor/ticket/28938

To reviewers: I did not include sys/param.h in src/ext/ed25519/donna/ed25519-donna-portable-identify.h because it was already included there.

Thanks!

Prior to this commit, the testsuite was failing on OpenBSD.  After
this commit the testsuite runs fine on OpenBSD.

It was previously decided to test for the OpenBSD macro (rather than
__OpenBSD__, etc.) because OpenBSD forks seem to have the former
macro defined.  sys/param.h must be included for the OpenBSD macro
definition; however, many files tested for the OpenBSD macro without
having this header included.

This commit includes sys/param.h in the files where the OpenBSD macro
is used (and sys/param.h is not already included), and it also
changes some instances of the __OpenBSD__ macro to OpenBSD.

See commit 27df23a which changed
everything to use OpenBSD instead of __OpenBSD__ or OPENBSD.  See
also tickets #6982 and #20980 (the latter ticket is where it was
decided to use the OpenBSD macro).

Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
@coveralls
Copy link

@coveralls coveralls commented Dec 23, 2018

Pull Request Test Coverage Report for Build 3510

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 361 unchanged lines in 7 files lost coverage.
  • Overall coverage increased (+0.0007%) to 61.112%

Files with Coverage Reduction New Missed Lines %
src/lib/fs/freespace.c 1 77.78%
src/lib/crypt_ops/crypto_dh_openssl.c 4 97.12%
src/core/or/connection_or.c 10 46.26%
src/feature/dirparse/parsecommon.c 15 87.92%
src/lib/net/buffers_net.c 16 75.9%
src/lib/tls/tortls_openssl.c 23 95.37%
src/feature/relay/dns.c 292 16.67%
Totals Coverage Status
Change from base Build 3386: 0.0007%
Covered Lines: 44148
Relevant Lines: 72241

💛 - Coveralls

The fix was in commit 30b84ad.

Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
@torproject-pusher torproject-pusher deleted the branch torproject:master May 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment