diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-10-19 23:31:28 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-10-19 23:31:28 +0000 |
| commit | 89f1c38881d566bb731711632ac84ee1e3d883ee (patch) | |
| tree | 00289610dab206c26af27df616f2371542ee2a16 /io/ftwtest-sh | |
| parent | e40a0d2113bfeb5018409ed25e9711e6da7d994b (diff) | |
| download | glibc-89f1c38881d566bb731711632ac84ee1e3d883ee.zip glibc-89f1c38881d566bb731711632ac84ee1e3d883ee.tar.gz glibc-89f1c38881d566bb731711632ac84ee1e3d883ee.tar.bz2 | |
Use $(built-program-cmd) in io/ftwtest-sh.
Diffstat (limited to 'io/ftwtest-sh')
| -rw-r--r-- | io/ftwtest-sh | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/io/ftwtest-sh b/io/ftwtest-sh index 93b2e66..adc6667 100644 --- a/io/ftwtest-sh +++ b/io/ftwtest-sh @@ -47,8 +47,6 @@ export LANG tmp=`pwd | sed 's|\(.\)/*$|\1|'` tmpdir=$tmp/ftwtest.d -[ -f ${objpfx}elf/ld.so ] && ldso=${objpfx}elf/ld.so - trap 'chmod -fR a+x $tmpdir; rm -fr $tmpdir $testout' 1 2 3 15 if test -d $tmpdir; then @@ -73,7 +71,7 @@ chmod a-x,a+r $tmpdir/bar testout=$tmp/ftwtest.out -LD_LIBRARY_PATH=$objpfx $ldso $testprogram $tmpdir | +$testprogram $tmpdir | sort > $testout cat <<EOF | cmp $testout - || exit 1 @@ -92,7 +90,7 @@ base = "$tmp/ftwtest.d/foo/lvl1/lvl2/lvl3/", file = "file@3", flag = FTW_F, leve EOF rm $testout -LD_LIBRARY_PATH=$objpfx $ldso $testprogram --depth $tmpdir | +$testprogram --depth $tmpdir | sort > $testout cat <<EOF | cmp $testout - || exit 1 @@ -111,7 +109,7 @@ base = "$tmp/ftwtest.d/foo/lvl1/lvl2/lvl3/", file = "file@3", flag = FTW_F, leve EOF rm $testout -LD_LIBRARY_PATH=$objpfx $ldso $testprogram --phys $tmpdir | +$testprogram --phys $tmpdir | sort > $testout cat <<EOF | cmp $testout - || exit 1 @@ -135,7 +133,7 @@ rm $testout # For the next test everything must be readable. chmod -fR a+x $tmpdir -LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir $tmpdir | +$testprogram --chdir $tmpdir | sort > $testout # perhaps $tmp involves some symlinks... @@ -159,7 +157,7 @@ rm $testout curwd=`/bin/pwd 2>/dev/null || /usr/bin/pwd` cd "$tmp" -LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir ftwtest.d | +$testprogram --chdir ftwtest.d | sort > $testout cd "$curwd" @@ -181,7 +179,7 @@ rm $testout curwd=`/bin/pwd 2>/dev/null || /usr/bin/pwd` cd "$tmp" -LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir ftwtest.d/. | +$testprogram --chdir ftwtest.d/. | sort > $testout cd "$curwd" @@ -203,7 +201,7 @@ rm $testout curwd=`/bin/pwd 2>/dev/null || /usr/bin/pwd` cd "$tmp" -LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir ftwtest.d/foo/lvl1/link@1 | +$testprogram --chdir ftwtest.d/foo/lvl1/link@1 | sort > $testout cd "$curwd" @@ -212,7 +210,7 @@ base = "ftwtest.d/foo/lvl1/", file = "link@1", flag = FTW_SLN, cwd = $tmpreal/ft EOF rm $testout -LD_LIBRARY_PATH=$objpfx $ldso $testprogram --early-exit $tmpdir | +$testprogram --early-exit $tmpdir | sort > $testout cat <<EOF | cmp $testout - || exit 1 @@ -226,7 +224,7 @@ echo > $tmpdir/foo/lvl1b/file@1b echo > $tmpdir/foo/lvl1b/file2@1b echo > $tmpdir/foo/lvl1b/file3@1b -LD_LIBRARY_PATH=$objpfx $ldso $testprogram --skip-subtree=lvl1 $tmpdir | +$testprogram --skip-subtree=lvl1 $tmpdir | sort > $testout cat <<EOF | diff -u $testout - || exit 1 @@ -243,7 +241,7 @@ base = "$tmp/ftwtest.d/foo/lvl1b/", file = "file@1b", flag = FTW_F, level = 3 EOF rm $testout -LD_LIBRARY_PATH=$objpfx $ldso $testprogram --skip-siblings=lvl1 $tmpdir | +$testprogram --skip-siblings=lvl1 $tmpdir | sort > $testout # The filesystem is not required to put lvl1 before lvl1b. @@ -267,7 +265,7 @@ base = "$tmp/ftwtest.d/foo/lvl1b/", file = "file@1b", flag = FTW_F, level = 3 EOF rm $testout -LD_LIBRARY_PATH=$objpfx $ldso $testprogram --skip-siblings=file@1b $tmpdir | +$testprogram --skip-siblings=file@1b $tmpdir | sort > $testout # The filesystem is not required to put file2@1b and file3@1b after file@1b. |