Fix blender_test not re-linked on macOS after changes #106051

Sergey Sharybin · 2023-03-23T16:25:57+01:00

Sergey Sharybin commented

2023-03-23 16:25:57 +01:00

The Linux worked due to the libraries provided as a dependency
via EXTRA_LIBS "${TEST_LIBS}" with extra whole archive.

While on Windows and macOS the whole-archive is not needed the
dependency from the library to the blender_test is still needed.

Solves the issue when modifying asset_catalog_test.cc on macOS
does not make blender_test to be relinked.

The Linux worked due to the libraries provided as a dependency via `EXTRA_LIBS "${TEST_LIBS}"` with extra whole archive. While on Windows and macOS the whole-archive is not needed the dependency from the library to the blender_test is still needed. Solves the issue when modifying asset_catalog_test.cc on macOS does not make blender_test to be relinked.

Sergey Sharybin added 1 commit 2023-03-23 16:26:08 +01:00

buildbot/vexp-code-patch-coordinator Build done. Details

db84e7f30a Fix blender_test not re-linked on macOS after changes

The Linux worked due to the libraries provided as a dependency
via `EXTRA_LIBS "${TEST_LIBS}"` with extra whole archive.

While on Windows and macOS the whole-archive is not needed the
dependency from the library to the blender_test is still needed.

Solves the issue when modifying asset_catalog_test.cc on macOS
does not make blender_test to be relinked.

Sergey Sharybin added the

Module

Platforms, Builds & Tests

label 2023-03-23 16:26:24 +01:00

Sergey Sharybin added this to the Platforms, Builds Tests & Devices project 2023-03-23 16:26:28 +01:00

Sergey Sharybin requested review from Brecht Van Lommel 2023-03-23 16:26:44 +01:00

Sergey Sharybin requested review from Julian Eisel 2023-03-23 16:26:44 +01:00

Sergey Sharybin requested review from Ray molenkamp 2023-03-23 16:26:44 +01:00

Julian Eisel approved these changes 2023-03-23 16:43:36 +01:00

Brecht Van Lommel approved these changes 2023-03-24 11:05:39 +01:00

Sergey Sharybin commented

2023-03-24 12:44:32 +01:00

@blender-bot build

Sergey Sharybin merged commit 18a15bafe8 into main

2023-03-24 14:11:58 +01:00

Sergey Sharybin referenced this issue from a commit

2023-03-24 14:11:59 +01:00

Fix blender_test not re-linked on macOS after changes

Sergey Sharybin deleted branch fix_blender_test

2023-03-24 14:11:59 +01:00

Ankit Meel commented

2023-04-15 15:59:42 +02:00

This reintroduced a duplicate symbol linker error that we fixed in

dcb2821292

The dependency rebuild was supposedly fixed with

67856d8c4a

If it still shows up, suggest to use add_dependency instead of specifying linker dependencies.

duplicate symbol 'blender::fn::tests::field_SameFieldTwice_Test::test_info_' in:
    /Users/ankitkumar/apps/build_darwin_debug_lite/lib/libbf_functions_tests.a(FN_field_test.cc.o)
    lib/libbf_functions_tests.a(FN_field_test.cc.o)

This reintroduced a duplicate symbol linker error that we fixed in https://projects.blender.org/blender/blender/commit/dcb2821292f962951e88f146cb304160f21f73da The dependency rebuild was supposedly fixed with https://projects.blender.org/blender/blender/commit/67856d8c4afa6a35b15f00ce24ebe54f403c9fc7 If it still shows up, suggest to use add_dependency instead of specifying linker dependencies. ``` duplicate symbol 'blender::fn::tests::field_SameFieldTwice_Test::test_info_' in: /Users/ankitkumar/apps/build_darwin_debug_lite/lib/libbf_functions_tests.a(FN_field_test.cc.o) lib/libbf_functions_tests.a(FN_field_test.cc.o) ```

Sergey Sharybin commented

2023-04-17 09:29:38 +02:00

@ankitm The issue you're describing does not happen on any of the platforms I have access to. Can you submit a PR with a fix which works for you?

Ankit Meel commented

2023-04-17 09:31:20 +02:00

@Sergey simply reverting this commit fixes the linker issue.

Sergey Sharybin commented

2023-04-17 09:35:20 +02:00

@ankitm Simply reverting the change will re-introduce the issue of tests not properly re-linked after changes which me and Julian were running into. So that's not really an option on its own. There must be a fix which addresses both proper linking and the duplicate symbols issues. Is just easier for someone who has the duplicate symbols issue to work that proper solution.