| 1 |
commit: c9c6818b15d21aaeb96f96e9e91a819826fa1078 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 28 22:07:48 2011 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 28 22:07:48 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=c9c6818b |
| 7 |
|
| 8 |
misc/test-revdep-pax/testrevdeppax.sh: cleanup output |
| 9 |
|
| 10 |
--- |
| 11 |
misc/test-revdep-pax/README | 4 ++-- |
| 12 |
misc/test-revdep-pax/testrevdeppax.sh | 12 +++++++----- |
| 13 |
2 files changed, 9 insertions(+), 7 deletions(-) |
| 14 |
|
| 15 |
diff --git a/misc/test-revdep-pax/README b/misc/test-revdep-pax/README |
| 16 |
index 83af910..a94c171 100644 |
| 17 |
--- a/misc/test-revdep-pax/README |
| 18 |
+++ b/misc/test-revdep-pax/README |
| 19 |
@@ -31,5 +31,5 @@ THEN |
| 20 |
|
| 21 |
The script tests all possible combinations of the RANDMMAP flag on both |
| 22 |
the binary /usr/bin/testrevdeppax and library /usr/lib64/libmyrevdeppax.so.0.0.0 |
| 23 |
-It then tests both forward migrating the pax markings from the binary to the |
| 24 |
-library and then reverse migrating them from the library to the binary. |
| 25 |
+It then tests only reverse migrating the pax markings from the library to the |
| 26 |
+binary. Forward migrating would be bad because it'll migrate the flags to glibc! |
| 27 |
|
| 28 |
diff --git a/misc/test-revdep-pax/testrevdeppax.sh b/misc/test-revdep-pax/testrevdeppax.sh |
| 29 |
index 75419e8..d841fae 100755 |
| 30 |
--- a/misc/test-revdep-pax/testrevdeppax.sh |
| 31 |
+++ b/misc/test-revdep-pax/testrevdeppax.sh |
| 32 |
@@ -15,17 +15,19 @@ echo "Testing reverse migration $LIBRARY -> $BINARY" |
| 33 |
echo "(This will take a while)" |
| 34 |
echo |
| 35 |
|
| 36 |
-for i in 'R' 'r' 'Rr' |
| 37 |
+for i in "R" "r" "Rr" |
| 38 |
do |
| 39 |
- for j in 'R' 'r' 'Rr' |
| 40 |
+ for j in "R" "r" "Rr" |
| 41 |
do |
| 42 |
$PAXCTLNG -z $BINARY |
| 43 |
$PAXCTLNG -$i $BINARY |
| 44 |
$PAXCTLNG -z $LIBRARY |
| 45 |
$PAXCTLNG -$j $LIBRARY |
| 46 |
- echo "Binary -> $i" |
| 47 |
- echo "Library -> $j" |
| 48 |
- $REVDEPPAX -m -l $LIBRARY |
| 49 |
+ p=$i; [[ "$p" == "Rr" ]] && p="-" |
| 50 |
+ echo "Binary -> $p" |
| 51 |
+ p=$j; [[ "$p" == "Rr" ]] && p="-" |
| 52 |
+ echo "Library -> $p" |
| 53 |
+ $REVDEPPAX -m -y -l $LIBRARY |
| 54 |
echo |
| 55 |
done |
| 56 |
done |
Archives