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

i#4291: append to LD_PRELOAD when using -late #4292

Merged
merged 5 commits into from
May 18, 2020
Merged

i#4291: append to LD_PRELOAD when using -late #4292

merged 5 commits into from
May 18, 2020

Conversation

mattgreen
Copy link
Contributor

When using -late, append to LD_PRELOAD rather than overwrite it.

Fixes #4291

When using -late, append to LD_PRELOAD rather than overwrite it.

Fixes #4291
Copy link
Contributor

@derekbruening derekbruening left a comment

Choose a reason for hiding this comment

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

Thank you for the patch.

@derekbruening
Copy link
Contributor

run arm tests

@derekbruening
Copy link
Contributor

Travis is misbehaving: their Mac bots are dying or sthg midway through our build. Will try one more rerun.

@derekbruening
Copy link
Contributor

So it is in fact a build failure on Mac. It is not presented very well which is #4223.

/Users/travis/build/DynamoRIO/dynamorio/core/unix/injector.c:221:17: error: unused variable 'ld_preload' [-Werror,-Wunused-variable]
    const char *ld_preload = NULL;
                ^
Users/travis/build/DynamoRIO/dynamorio/core/unix/injector.c:223:17: error: unused variable 'cur_preload' [-Werror,-Wunused-variable]
    const char *cur_preload = getenv("LD_PRELOAD");
                ^
/Users/travis/build/DynamoRIO/dynamorio/core/unix/injector.c:222:17: error: unused variable 'dr_ld_preload_libs' [-Werror,-Wunused-variable]
    const char *dr_ld_preload_libs = "libdynamorio.so libdrpreload.so";
                ^
/Users/travis/build/DynamoRIO/dynamorio/core/unix/injector.c:216:10: error: unused variable 'ld_preload_libs' [-Werror,-Wunused-variable]
    char ld_preload_libs[MAX_OPTIONS_STRING];

@mattgreen, If you could fix the build failure.

core/unix/injector.c Outdated Show resolved Hide resolved
@mattgreen
Copy link
Contributor Author

Hmm, Windows build failed. I'm surprised by that considering the source file isn't in the build. Is there a way to re-run it?

@derekbruening
Copy link
Contributor

Hmm, Windows build failed. I'm surprised by that considering the source file isn't in the build. Is there a way to re-run it?

Looks like drwrap-test 32-bit: #4231. Yes it can be re-run individually but I'll update the branch which is another way to re-run.

@derekbruening
Copy link
Contributor

run arm tests

@derekbruening
Copy link
Contributor

Just documenting that we're going to live without a test for the new code.

@derekbruening derekbruening merged commit ed906db into DynamoRIO:master May 18, 2020
@mattgreen
Copy link
Contributor Author

Thanks for the feedback and accepting it!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

drrun overwrites LD_PRELOAD when using -late
2 participants