diff options
author | Rob Landley <rob@landley.net> | 2006-03-18 03:01:57 +0000 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2006-03-18 03:01:57 +0000 |
commit | 6bc10635f8a907771532c91132de5e5a0fde5d41 (patch) | |
tree | 41ac3c2f765398c17dfdfa1ff41ae1eed404f37a | |
parent | dcb2122e853ab4b82e0baf44f7110f16c7c74dc3 (diff) | |
download | busybox-w32-6bc10635f8a907771532c91132de5e5a0fde5d41.tar.gz busybox-w32-6bc10635f8a907771532c91132de5e5a0fde5d41.tar.bz2 busybox-w32-6bc10635f8a907771532c91132de5e5a0fde5d41.zip |
Make the new chroot environment creation infrastructure more flexible about
non-absolute paths.
-rwxr-xr-x | testsuite/testing.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/testsuite/testing.sh b/testsuite/testing.sh index bec5976e1..19d93f5a8 100755 --- a/testsuite/testing.sh +++ b/testsuite/testing.sh | |||
@@ -110,13 +110,16 @@ function mkchroot | |||
110 | shift | 110 | shift |
111 | for i in "$@" | 111 | for i in "$@" |
112 | do | 112 | do |
113 | if [ "${i:0:1}" == "/" ] | 113 | [ "${i:0:1}" == "/" ] || i=$(which $i) |
114 | [ -f "$dest/$i" ] && continue | ||
115 | if [ -e "$i" ] | ||
114 | then | 116 | then |
115 | [ -f "$dest/$i" ] && continue | ||
116 | d=`echo "$i" | grep -o '.*/'` && | 117 | d=`echo "$i" | grep -o '.*/'` && |
117 | mkdir -p "$dest/$d" && | 118 | mkdir -p "$dest/$d" && |
118 | cat "$i" > "$dest/$i" && | 119 | cat "$i" > "$dest/$i" && |
119 | chmod +x "$dest/$i" | 120 | chmod +x "$dest/$i" |
121 | else | ||
122 | echo "Not found: $i" | ||
120 | fi | 123 | fi |
121 | mkchroot "$dest" $(ldd "$i" | egrep -o '/.* ') | 124 | mkchroot "$dest" $(ldd "$i" | egrep -o '/.* ') |
122 | done | 125 | done |