Differential D3409

Fix rP24665
ClosedPublic
Actions

Authored by Stan on Jan 18 2021, 11:01 AM.

Details

Reviewers

wraitii

Commits

rP24682: Fix Phab:rP24665 and Phab:rP24185

Trac Tickets

#5934

Summary

Using vector seemed to have unwanted side effects as the objects need to be unique.

Test Plan

Test the bug described in #5934

Diff Detail

Repository

rP 0 A.D. Public Repository

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Stan created this revision.Jan 18 2021, 11:01 AM

Build has FAILED

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/4592/display/redirect
See console output for more information: https://jenkins.wildfiregames.com/job/docker-differential/4592/display/redirectconsole

Build is green

builderr-debug-macos.txt
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libengine_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libatlas_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libgui_dbg.a(precompiled.o) has no symbols
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for

See https://jenkins.wildfiregames.com/job/macos-differential/2935/display/redirect for more details.

Harbormaster completed remote builds in B15182: Diff 15452.Jan 18 2021, 11:11 AM

Stan requested review of this revision.Jan 18 2021, 11:11 AM

Simpler fix using @wraitii's suggestion, makes the tests happy

Build is green

builderr-debug-macos.txt
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libgui_dbg.a(precompiled.o) has no symbols
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/CoreVi

See https://jenkins.wildfiregames.com/job/macos-differential/2940/display/redirect for more details.

Stan edited the summary of this revision. (Show Details)Jan 18 2021, 1:14 PM

This revision was not accepted when it landed; it landed in state Needs Review.Jan 18 2021, 1:16 PM

This revision was landed with ongoing or failed builds.

Closed by commit rP24682: Fix Phab:rP24665 and Phab:rP24185 (authored by Stan). · Explain Why

This revision was automatically updated to reflect the committed changes.

Stan added a commit: rP24682: Fix Phab:rP24665 and Phab:rP24185 .

Harbormaster completed remote builds in B15194: Diff 15463.Jan 18 2021, 1:37 PM