| 1 |
commit: d71412e9c251577abb85d719ad351c3b433326a6 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 20 18:13:23 2013 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 20 20:00:47 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=d71412e9 |
| 7 |
|
| 8 |
tests/{paxmodule,revdeppaxtest}: fix to work with all combinations of --{en,dis}able-{pt,xt}pax |
| 9 |
|
| 10 |
--- |
| 11 |
src/paxctl-ng.c | 8 +++--- |
| 12 |
tests/paxmodule/paxmodtest.sh | 49 +++++++++++++++++++++++------------- |
| 13 |
tests/revdeppaxtest/revdeptest.sh | 4 +- |
| 14 |
3 files changed, 37 insertions(+), 24 deletions(-) |
| 15 |
|
| 16 |
diff --git a/src/paxctl-ng.c b/src/paxctl-ng.c |
| 17 |
index a451aac..4d69ab4 100644 |
| 18 |
--- a/src/paxctl-ng.c |
| 19 |
+++ b/src/paxctl-ng.c |
| 20 |
@@ -473,24 +473,24 @@ print_flags(int fd, int verbose) |
| 21 |
#ifdef PTPAX |
| 22 |
flags = get_pt_flags(fd, verbose); |
| 23 |
if( flags == UINT16_MAX ) |
| 24 |
- printf("\tPT_PAX : not found\n"); |
| 25 |
+ printf("\tPT_PAX : not found\n"); |
| 26 |
else |
| 27 |
{ |
| 28 |
memset(buf, 0, FLAGS_SIZE); |
| 29 |
bin2string4print(flags, buf); |
| 30 |
- printf("\tPT_PAX : %s\n", buf); |
| 31 |
+ printf("\tPT_PAX : %s\n", buf); |
| 32 |
} |
| 33 |
#endif |
| 34 |
|
| 35 |
#ifdef XTPAX |
| 36 |
flags = get_xt_flags(fd); |
| 37 |
if( flags == UINT16_MAX ) |
| 38 |
- printf("\tXATTR_PAX: not found\n"); |
| 39 |
+ printf("\tXATTR_PAX : not found\n"); |
| 40 |
else |
| 41 |
{ |
| 42 |
memset(buf, 0, FLAGS_SIZE); |
| 43 |
bin2string4print(flags, buf); |
| 44 |
- printf("\tXATTR_PAX: %s\n", buf); |
| 45 |
+ printf("\tXATTR_PAX : %s\n", buf); |
| 46 |
} |
| 47 |
#endif |
| 48 |
} |
| 49 |
|
| 50 |
diff --git a/tests/paxmodule/paxmodtest.sh b/tests/paxmodule/paxmodtest.sh |
| 51 |
index 8e831bf..dc99a38 100755 |
| 52 |
--- a/tests/paxmodule/paxmodtest.sh |
| 53 |
+++ b/tests/paxmodule/paxmodtest.sh |
| 54 |
@@ -37,21 +37,22 @@ export PYTHONPATH="$(pwd)/../../scripts/build/lib.linux-${unamem}-${pythonversio |
| 55 |
|
| 56 |
#NOTE: the last -D or -U wins as it does for gcc $CFLAGS |
| 57 |
for f in $@; do |
| 58 |
- [ $f = "-UXTPAX" ] && unset XTPAX |
| 59 |
- [ $f = "-DXTPAX" ] && XTPAX=1 |
| 60 |
- [ $f = "-UPTPAX" ] && unset PTPAX |
| 61 |
- [ $f = "-DPTPAX" ] && PTPAX=1 |
| 62 |
+ [[ $f = "-UXTPAX" ]] && unset XTPAX |
| 63 |
+ [[ $f = "-DXTPAX" ]] && XTPAX=1 |
| 64 |
+ [[ $f = "-UPTPAX" ]] && unset PTPAX |
| 65 |
+ [[ $f = "-DPTPAX" ]] && PTPAX=1 |
| 66 |
done |
| 67 |
export XTPAX |
| 68 |
export PTPAX |
| 69 |
|
| 70 |
-if [ -d ${PYTHONPATH} ]; then |
| 71 |
+if [[ -d ${PYTHONPATH} ]]; then |
| 72 |
rm -rf ${PYTHONPATH} |
| 73 |
- echo " (Re)building pax module" |
| 74 |
- ( cd ../../scripts; exec ./setup.py build ) >/dev/null |
| 75 |
fi |
| 76 |
+echo " Rebuilding pax module" |
| 77 |
+( cd ../../scripts; exec ./setup.py build ) >/dev/null |
| 78 |
|
| 79 |
count=0 |
| 80 |
+dots=0 |
| 81 |
|
| 82 |
for pf in "p" "P" "-"; do |
| 83 |
for ef in "e" "E" "-"; do |
| 84 |
@@ -60,7 +61,7 @@ for pf in "p" "P" "-"; do |
| 85 |
for sf in "s" "S" "-"; do |
| 86 |
|
| 87 |
pflags="${pf}${ef}${mf}${rf}${sf}" |
| 88 |
- if [ "${verbose}" != 0 ] ;then |
| 89 |
+ if [[ "${verbose}" != 0 ]] ;then |
| 90 |
echo "SET TO :" ${pflags} |
| 91 |
fi |
| 92 |
|
| 93 |
@@ -69,21 +70,26 @@ for pf in "p" "P" "-"; do |
| 94 |
|
| 95 |
sflags=$(${PYPAXCTL} -g ${TESTFILE}) |
| 96 |
|
| 97 |
- if [ "${verbose}" != 0 ] ;then |
| 98 |
+ if [[ "${verbose}" != 0 ]] ;then |
| 99 |
echo "GOT :" ${sflags} |
| 100 |
fi |
| 101 |
|
| 102 |
- if [ "${pflags}" != "${sflags}" ]; then |
| 103 |
+ if [[ "${pflags}" != "${sflags}" ]]; then |
| 104 |
(( count = count + 1 )) |
| 105 |
- if [ "${verbose}" != 0 ] ;then |
| 106 |
+ if [[ "${verbose}" != 0 ]] ;then |
| 107 |
echo "Mismatch: ${pflags} ${sflags}" |
| 108 |
fi |
| 109 |
fi |
| 110 |
|
| 111 |
- if [ "${verbose}" != 0 ] ;then |
| 112 |
+ if [[ "${verbose}" != 0 ]] ;then |
| 113 |
echo |
| 114 |
else |
| 115 |
+ (( dots = dots + 1 )) |
| 116 |
echo -n "." |
| 117 |
+ if [[ "$dots" = "80" ]]; then |
| 118 |
+ dots=0 |
| 119 |
+ echo |
| 120 |
+ fi |
| 121 |
fi |
| 122 |
|
| 123 |
done |
| 124 |
@@ -94,6 +100,8 @@ done |
| 125 |
|
| 126 |
echo |
| 127 |
|
| 128 |
+dots=0 |
| 129 |
+ |
| 130 |
for pf in "p" "P" "-"; do |
| 131 |
for ef in "e" "E" "-"; do |
| 132 |
for mf in "m" "M" "-"; do |
| 133 |
@@ -101,7 +109,7 @@ for pf in "p" "P" "-"; do |
| 134 |
for sf in "s" "S" "-"; do |
| 135 |
|
| 136 |
pflags="${pf}${ef}${mf}${rf}${sf}" |
| 137 |
- if [ "${verbose}" != 0 ] ;then |
| 138 |
+ if [[ "${verbose}" != 0 ]] ;then |
| 139 |
echo "SET TO :" ${pflags} |
| 140 |
fi |
| 141 |
|
| 142 |
@@ -111,21 +119,26 @@ for pf in "p" "P" "-"; do |
| 143 |
sflags=$(${PAXCTLNG} -v ${TESTFILE}) |
| 144 |
sflags=$(echo ${sflags} | awk '{print $4}') |
| 145 |
|
| 146 |
- if [ "${verbose}" != 0 ] ;then |
| 147 |
+ if [[ "${verbose}" != 0 ]] ;then |
| 148 |
echo "GOT :" ${sflags} |
| 149 |
fi |
| 150 |
|
| 151 |
- if [ "${pflags}" != "${sflags}" ]; then |
| 152 |
+ if [[ "${pflags}" != "${sflags}" ]]; then |
| 153 |
(( count = count + 1 )) |
| 154 |
- if [ "${verbose}" != 0 ] ;then |
| 155 |
+ if [[ "${verbose}" != 0 ]] ;then |
| 156 |
echo "Mismatch: ${pflags} ${sflags}" |
| 157 |
fi |
| 158 |
fi |
| 159 |
|
| 160 |
- if [ "${verbose}" != 0 ] ;then |
| 161 |
+ if [[ "${verbose}" != 0 ]] ;then |
| 162 |
echo |
| 163 |
else |
| 164 |
+ (( dots = dots + 1 )) |
| 165 |
echo -n "." |
| 166 |
+ if [[ "$dots" = "80" ]]; then |
| 167 |
+ dots=0 |
| 168 |
+ echo |
| 169 |
+ fi |
| 170 |
fi |
| 171 |
|
| 172 |
done |
| 173 |
@@ -134,7 +147,7 @@ for pf in "p" "P" "-"; do |
| 174 |
done |
| 175 |
done |
| 176 |
|
| 177 |
-if [ "${verbose}" = 0 ] ;then |
| 178 |
+if [[ "${verbose}" = 0 ]] ;then |
| 179 |
echo |
| 180 |
echo |
| 181 |
fi |
| 182 |
|
| 183 |
diff --git a/tests/revdeppaxtest/revdeptest.sh b/tests/revdeppaxtest/revdeptest.sh |
| 184 |
index e8380e8..25d077b 100755 |
| 185 |
--- a/tests/revdeppaxtest/revdeptest.sh |
| 186 |
+++ b/tests/revdeppaxtest/revdeptest.sh |
| 187 |
@@ -79,9 +79,9 @@ export PTPAX |
| 188 |
|
| 189 |
if [ -d ${PYTHONPATH} ]; then |
| 190 |
rm -rf ${PYTHONPATH} |
| 191 |
- echo " (Re)building pax module" |
| 192 |
- ( cd ../../scripts; exec ./setup.py build ) >/dev/null |
| 193 |
fi |
| 194 |
+echo " Rebuilding pax module" |
| 195 |
+( cd ../../scripts; exec ./setup.py build ) >/dev/null |
| 196 |
|
| 197 |
count=0 |
Archives