Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.
/ druntime Public archive

profile test: allow both the old and the new mangling#1878

Merged
dlang-bot merged 1 commit intodlang:masterfrom
rainers:fix_profile_mangle_test
Jul 16, 2017
Merged

profile test: allow both the old and the new mangling#1878
dlang-bot merged 1 commit intodlang:masterfrom
rainers:fix_profile_mangle_test

Conversation

@rainers
Copy link
Member

@rainers rainers commented Jul 16, 2017

needed for dlang/dmd#6998

@dlang-bot
Copy link
Contributor

Thanks for your pull request, @rainers!

Bugzilla references

Your PR doesn't reference any Bugzilla issue.

If your PR contains non-trivial changes, please reference a Bugzilla issue or create a manual changelog.

$(QUIET)$(GREP) -q '1 .*_Dmain' $(ROOT)/both.log
$(QUIET)$(GREP) -q '1000 .*both.Num\* both.foo(uint)' $(ROOT)/both.log
$(QUIET)$(DIFF) both.def.exp $(ROOT)/both.def
$(QUIET)$(DIFF) both.def.exp $(ROOT)/both.def || $(DIFF) both.def.exp2 $(ROOT)/both.def
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe adding a new comment that this allows the old & new mangling and can be removed in the future wouldn't hurt?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Amended a comment

@@ -0,0 +1,5 @@

FUNCTIONS
_Dmain
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have tabs here ... (you need to either replace them or make the check more specific)..

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those tabs are generated as part of the profile output and are also in both.exp.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know - I was just FYIing the CI error.
I didn't add the whitespace check here, but it seems that .exp files are explicitly filtered out. So the simple fix is to rename the file ...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, misunderstood at first. Renamed now.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@rainers rainers force-pushed the fix_profile_mangle_test branch from cd1122c to 43d953f Compare July 16, 2017 16:45
@rainers rainers force-pushed the fix_profile_mangle_test branch from 43d953f to e80a739 Compare July 16, 2017 16:51
@dlang-bot dlang-bot merged commit 0d9e08f into dlang:master Jul 16, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

Comments