Include test sources to pick up functions and classes from the module… #2356
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I observed this linker problem for the first time when experimenting with this |
vitaut
reviewed
Jun 26, 2021
test/module-test.cc
Outdated
Comment on lines
38
to
53
| #ifndef FMT_POSIX | ||
| # if defined(_WIN32) && !defined(__MINGW32__) | ||
| # define FMT_POSIX(call) _##call | ||
| # else | ||
| # define FMT_POSIX(call) call | ||
| # endif | ||
| #endif | ||
| #ifndef _WIN32 | ||
| # define FMT_RETRY_VAL(result, expression, error_result) \ | ||
| do { \ | ||
| (result) = (expression); \ | ||
| } while ((result) == (error_result) && errno == EINTR) | ||
| #else | ||
| # define FMT_RETRY_VAL(result, expression, error_result) result = (expression) | ||
| #endif | ||
| #define FMT_RETRY(result, expression) FMT_RETRY_VAL(result, expression, -1) |
There was a problem hiding this comment.
Why is this copy-pasted here?
There was a problem hiding this comment.
These 2 macros are defined in os.h which cannot be included because it would reintroduce parts of {fmt} into the TU with different linkage and/or mangling. Avoiding such problems is the whole point of the PR. Unfortunately, pieces of the library are used in the implementation of the test support facilities of the library itself.
DanielaE
force-pushed
the
fix/linker-symbols-in-module-test
branch
from
32c40db to
42cd1c4
Compare
|
The changes are incorporated, the PR is rebased onto HEAD |
vitaut
reviewed
Jul 3, 2021
test/gtest-extra.cc
Outdated
| FMT_RETRY(result, fflush(file_)); | ||
| do { | ||
| result = fflush(file_); | ||
| } while (result == -1 && errno == EINTR); |
There was a problem hiding this comment.
Let's use EOF instead of -1 here.
… rather than from the non-modular library which is baked into the `test-main` library. This averts linker problems: - strong ownership model: missing linker symbols - weak ownership model: duplicate linker symbols Simplify `gtest-extra.cc` while at it.
DanielaE
force-pushed
the
fix/linker-symbols-in-module-test
branch
from
42cd1c4 to
1737f32
Compare
|
Thank you! |
PoetaKodu
pushed a commit
to pacc-repo/fmt
that referenced
this pull request
Nov 11, 2021
… rather than from the non-modular library which is baked into the `test-main` library. (fmtlib#2356) This averts linker problems: - strong ownership model: missing linker symbols - weak ownership model: duplicate linker symbols Simplify `gtest-extra.cc` while at it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
… rather than from the non-modular library that's baked into the
test-mainlibrary.This avoids linker problems: