summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-04-28 09:21:39 (GMT)
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-04-28 09:21:39 (GMT)
commite56e524239ba4a75e6ce490cab07ae13fcd096dc (patch)
tree7652f2f332a7fee63e8193d6e35c32e3ec0f59b4
parent927b3322314804bc46f1cd393884cd05826c187e (diff)
parentbb04c06a661d3ae82974803fad13c4f68ad39e4d (diff)
downloadpatchelf-e56e524239ba4a75e6ce490cab07ae13fcd096dc.zip
patchelf-e56e524239ba4a75e6ce490cab07ae13fcd096dc.tar.gz
patchelf-e56e524239ba4a75e6ce490cab07ae13fcd096dc.tar.bz2
Merge pull request #81 from fsateler/force-pagesize
no-rpath-prebuild: force pagesize to 4096 on prebuilt binaries
-rwxr-xr-xtests/no-rpath-prebuild.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/no-rpath-prebuild.sh b/tests/no-rpath-prebuild.sh
index d059dda..aa27b7a 100755
--- a/tests/no-rpath-prebuild.sh
+++ b/tests/no-rpath-prebuild.sh
@@ -1,6 +1,7 @@
#! /bin/sh -e
set -x
ARCH="$1"
+PAGESIZE=4096
if [ -z "$ARCH" ]; then
ARCH=$(basename $0 .sh | sed -e 's/.*-//')
@@ -25,13 +26,13 @@ mkdir -p ${SCRATCH}
cp $no_rpath_bin ${SCRATCH}/no-rpath
-oldRPath=$(../src/patchelf --print-rpath ${SCRATCH}/no-rpath)
+oldRPath=$(../src/patchelf --page-size ${PAGESIZE} --print-rpath ${SCRATCH}/no-rpath)
if test -n "$oldRPath"; then exit 1; fi
-../src/patchelf \
- --set-interpreter "$(../src/patchelf --print-interpreter ../src/patchelf)" \
+../src/patchelf --page-size ${PAGESIZE} \
+ --set-interpreter "$(../src/patchelf --page-size ${PAGESIZE} --print-interpreter ../src/patchelf)" \
--set-rpath /foo:/bar:/xxxxxxxxxxxxxxx ${SCRATCH}/no-rpath
-newRPath=$(../src/patchelf --print-rpath ${SCRATCH}/no-rpath)
+newRPath=$(../src/patchelf --page-size ${PAGESIZE} --print-rpath ${SCRATCH}/no-rpath)
if ! echo "$newRPath" | grep -q '/foo:/bar'; then
echo "incomplete RPATH"
exit 1