180 lines
4.4 KiB
Diff
180 lines
4.4 KiB
Diff
|
diff --git a/testsuite/Makefile b/testsuite/Makefile
|
||
|
|
index b8d295f..dc23da2 100644
|
||
|
|
--- a/testsuite/Makefile
|
||
|
|
+++ b/testsuite/Makefile
|
||
|
|
@@ -457,7 +457,7 @@ uninstall-am:
|
||
|
|
|
||
|
|
|
||
|
|
prog: prog.c
|
||
|
|
- $(CC) $(RPATH) -o $@ $<
|
||
|
|
+ $(CC) $(RPATH) $(MYFLAGS) -o $@ $<
|
||
|
|
|
||
|
|
check: $(CHRPATH)
|
||
|
|
$(srcdir)/runtest.sh
|
||
|
|
diff --git a/testsuite/runtest.sh b/testsuite/runtest.sh
|
||
|
|
index f913bc5..f6e7807 100755
|
||
|
|
--- a/testsuite/runtest.sh
|
||
|
|
+++ b/testsuite/runtest.sh
|
||
|
|
@@ -6,77 +6,90 @@ CHRPATH=../chrpath
|
||
|
|
|
||
|
|
retval=0
|
||
|
|
|
||
|
|
-rm prog
|
||
|
|
-make prog
|
||
|
|
-
|
||
|
|
-if $CHRPATH -h ; then
|
||
|
|
- echo "success: chrpath -h worked."
|
||
|
|
-else
|
||
|
|
- echo "error: chrpath -h failed."
|
||
|
|
- retval=1
|
||
|
|
-fi
|
||
|
|
-
|
||
|
|
-if $CHRPATH -v ; then
|
||
|
|
- echo "success: chrpath -v worked."
|
||
|
|
-else
|
||
|
|
- echo "error: chrpath -v failed."
|
||
|
|
- retval=1
|
||
|
|
-fi
|
||
|
|
-
|
||
|
|
-if $CHRPATH $0 ; then
|
||
|
|
- echo "error: chrpath on /bin/sh script worked."
|
||
|
|
- retval=1
|
||
|
|
-else
|
||
|
|
- echo "success: chrpath on /bin/sh script failed."
|
||
|
|
-fi
|
||
|
|
-
|
||
|
|
-if $CHRPATH non-existant-file ; then
|
||
|
|
- echo "error: chrpath on non-existant file worked."
|
||
|
|
- retval=1
|
||
|
|
-else
|
||
|
|
- echo "success: chrpath on non-existant file failed."
|
||
|
|
-fi
|
||
|
|
-
|
||
|
|
-if $CHRPATH -l prog | grep -q 'R.*PATH=.*/usr/local/lib' ; then
|
||
|
|
- echo "success: chrpath listed current rpath."
|
||
|
|
-else
|
||
|
|
- echo "error: chrpath unable to list current rpath."
|
||
|
|
- retval=1
|
||
|
|
-fi
|
||
|
|
-
|
||
|
|
-$CHRPATH -r '/usr/lib' prog > /dev/null
|
||
|
|
-
|
||
|
|
-if $CHRPATH -l prog | grep -q 'R.*PATH=/usr/lib' ; then
|
||
|
|
- echo "success: chrpath changed rpath."
|
||
|
|
-else
|
||
|
|
- echo "error: chrpath unable to change rpath."
|
||
|
|
- retval=1
|
||
|
|
-fi
|
||
|
|
-
|
||
|
|
-# I wish inserting a larger path would work, but it doesn't yet
|
||
|
|
-if $CHRPATH -r '/usr/lib:/usr/local/lib' prog > /dev/null ; then
|
||
|
|
- echo "success: chrpath changed rpath to larger path."
|
||
|
|
-else
|
||
|
|
- echo "error: chrpath unable to change rpath to larger path."
|
||
|
|
-fi
|
||
|
|
-
|
||
|
|
-$CHRPATH -c prog > /dev/null
|
||
|
|
-
|
||
|
|
-if $CHRPATH -l prog | grep -q 'RUNPATH=/usr/lib' ; then
|
||
|
|
- echo "success: chrpath converted rpath to runpath."
|
||
|
|
-else
|
||
|
|
- # Not all archs support runpath, ie not a fatal error
|
||
|
|
- echo "warning: chrpath unable to convert rpath to runpath."
|
||
|
|
-fi
|
||
|
|
-
|
||
|
|
-$CHRPATH -d prog > /dev/null
|
||
|
|
-
|
||
|
|
-if $CHRPATH -l prog | grep -q 'no rpath or runpath tag found' ; then
|
||
|
|
- echo "success: chrpath removed rpath and runpath successfully."
|
||
|
|
-else
|
||
|
|
- echo "error: chrpath unable to remove rpath or runpath."
|
||
|
|
- retval=1
|
||
|
|
-fi
|
||
|
|
+function do_test() {
|
||
|
|
+ rm prog
|
||
|
|
+ make prog
|
||
|
|
+
|
||
|
|
+ if $CHRPATH -h ; then
|
||
|
|
+ echo "success: chrpath -h worked."
|
||
|
|
+ else
|
||
|
|
+ echo "error: chrpath -h failed."
|
||
|
|
+ retval=1
|
||
|
|
+ fi
|
||
|
|
+
|
||
|
|
+ if $CHRPATH -v ; then
|
||
|
|
+ echo "success: chrpath -v worked."
|
||
|
|
+ else
|
||
|
|
+ echo "error: chrpath -v failed."
|
||
|
|
+ retval=1
|
||
|
|
+ fi
|
||
|
|
+
|
||
|
|
+ if $CHRPATH $0 ; then
|
||
|
|
+ echo "error: chrpath on /bin/sh script worked."
|
||
|
|
+ retval=1
|
||
|
|
+ else
|
||
|
|
+ echo "success: chrpath on /bin/sh script failed."
|
||
|
|
+ fi
|
||
|
|
+
|
||
|
|
+ if $CHRPATH non-existant-file ; then
|
||
|
|
+ echo "error: chrpath on non-existant file worked."
|
||
|
|
+ retval=1
|
||
|
|
+ else
|
||
|
|
+ echo "success: chrpath on non-existant file failed."
|
||
|
|
+ fi
|
||
|
|
+
|
||
|
|
+ if $CHRPATH -l prog | grep -q 'R.*PATH=.*/usr/local/lib' ; then
|
||
|
|
+ echo "success: chrpath listed current rpath."
|
||
|
|
+ else
|
||
|
|
+ echo "error: chrpath unable to list current rpath."
|
||
|
|
+ retval=1
|
||
|
|
+ fi
|
||
|
|
+
|
||
|
|
+ $CHRPATH -r '/usr/lib' prog > /dev/null
|
||
|
|
+
|
||
|
|
+ if $CHRPATH -l prog | grep -q 'R.*PATH=/usr/lib' ; then
|
||
|
|
+ echo "success: chrpath changed rpath."
|
||
|
|
+ else
|
||
|
|
+ echo "error: chrpath unable to change rpath."
|
||
|
|
+ retval=1
|
||
|
|
+ fi
|
||
|
|
+
|
||
|
|
+ # I wish inserting a larger path would work, but it doesn't yet
|
||
|
|
+ if $CHRPATH -r '/usr/lib:/usr/local/lib' prog > /dev/null ; then
|
||
|
|
+ echo "success: chrpath changed rpath to larger path."
|
||
|
|
+ else
|
||
|
|
+ echo "error: chrpath unable to change rpath to larger path."
|
||
|
|
+ fi
|
||
|
|
+
|
||
|
|
+ $CHRPATH -c prog > /dev/null
|
||
|
|
+
|
||
|
|
+ if $CHRPATH -l prog | grep -q 'RUNPATH=/usr/lib' ; then
|
||
|
|
+ echo "success: chrpath converted rpath to runpath."
|
||
|
|
+ else
|
||
|
|
+ # Not all archs support runpath, ie not a fatal error
|
||
|
|
+ echo "warning: chrpath unable to convert rpath to runpath."
|
||
|
|
+ fi
|
||
|
|
+
|
||
|
|
+ $CHRPATH -d prog > /dev/null
|
||
|
|
+
|
||
|
|
+ if $CHRPATH -l prog | grep -q 'no rpath or runpath tag found' ; then
|
||
|
|
+ echo "success: chrpath removed rpath and runpath successfully."
|
||
|
|
+ else
|
||
|
|
+ echo "error: chrpath unable to remove rpath or runpath."
|
||
|
|
+ retval=1
|
||
|
|
+ fi
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+# Run the base arch tests
|
||
|
|
+unset MYFLAGS
|
||
|
|
+do_test
|
||
|
|
+
|
||
|
|
+# Optionally run the compat arch tests
|
||
|
|
+MYFLAGS=""
|
||
|
|
+uname -m | egrep -q '^(x86_64|ppc64)$' && MYFLAGS="-m32"
|
||
|
|
+uname -m | grep -q '^s390x$' && MYFLAGS="-m31"
|
||
|
|
+export MYFLAGS
|
||
|
|
+test -z $MYFLAGS || do_test
|
||
|
|
|
||
|
|
exit $retval
|
||
|
|
|