diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-10-07 13:43:23 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2014-10-07 16:52:46 -0700 |
| commit | f57874dddefc03fef9ad36fbdd87e39a08a8d641 (patch) | |
| tree | 4cb51f492558475368ce0df190c12e8f1adf732a /test/etc/run-test-jar | |
| parent | 1000e69b7e11348f2e1d3ba67339616a647f53d7 (diff) | |
| download | art-f57874dddefc03fef9ad36fbdd87e39a08a8d641.tar.gz art-f57874dddefc03fef9ad36fbdd87e39a08a8d641.tar.bz2 art-f57874dddefc03fef9ad36fbdd87e39a08a8d641.zip | |
Remove libsigchain from LD_PRELOADS
Link sigchain.cc statically with dalvikvm, app_process,
surfaceflinger, dex2oat, patchoat and objdump.
Replace libsigchain.so with dummy implementaions to avoid
situations when it is used incorrectly.
Bug: 15345057
Bug: 15426766
Change-Id: If0b7f59a59824e30aa0c33dad76c7a44932180de
Diffstat (limited to 'test/etc/run-test-jar')
| -rwxr-xr-x | test/etc/run-test-jar | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index 59d241aba4..ea750e1c03 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -341,12 +341,9 @@ else if [ "$USE_GDB" = "y" ]; then # When running under gdb, we cannot do piping and grepping... - LD_PRELOAD=libsigchain.so $cmdline "$@" + $cmdline "$@" else - # If we are execing /bin/false we might not be on the same ISA as libsigchain.so - # ld.so will helpfully warn us of this. Unfortunately this messes up our error - # checking so we will just filter out the error with a grep. - LD_PRELOAD=libsigchain.so $cmdline "$@" 2>&1 | grep -v -E "^ERROR: ld\.so: object '.+\.so' from LD_PRELOAD cannot be preloaded.*: ignored\.$" + $cmdline "$@" 2>&1 # Add extra detail if time out is enabled. if [ ${PIPESTATUS[0]} = 124 ] && [ "$TIME_OUT" = "y" ]; then echo -e "\e[91mTEST TIMED OUT!\e[0m" >&2 |