diff options
| author | Roland McGrath <roland@gnu.org> | 2004-02-09 20:12:23 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2004-02-09 20:12:23 +0000 |
| commit | 5c81dec80ef2fc5b6d09380aaed05a6df9b2814f (patch) | |
| tree | 72de60924a6cb335a890c0233631acaf8aa50036 /io/ftwtest-sh | |
| parent | e48d897da9fc94fa6a0101cb74b1ec1554a1493e (diff) | |
| download | glibc-5c81dec80ef2fc5b6d09380aaed05a6df9b2814f.zip glibc-5c81dec80ef2fc5b6d09380aaed05a6df9b2814f.tar.gz glibc-5c81dec80ef2fc5b6d09380aaed05a6df9b2814f.tar.bz2 | |
2004-01-29 Roland McGrath <roland@redhat.com>
* io/ftwtest-sh: Use $tmp consistently, not literal /tmp.
Reported by Kevin P. Fleming <kpfleming@backtobasicsmgmt.com>.
Diffstat (limited to 'io/ftwtest-sh')
| -rw-r--r-- | io/ftwtest-sh | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/io/ftwtest-sh b/io/ftwtest-sh index dc495d5..6444ece 100644 --- a/io/ftwtest-sh +++ b/io/ftwtest-sh @@ -211,16 +211,16 @@ LD_LIBRARY_PATH=$objpfx $ldso $testprogram --skip-subtree=lvl1 $tmpdir | sort > $testout cat <<EOF | diff -u $testout - || exit 1 -base = "/tmp/", file = "ftwtest.d", flag = FTW_D, level = 0 -base = "/tmp/ftwtest.d/", file = "bar", flag = FTW_D, level = 1 -base = "/tmp/ftwtest.d/", file = "baz", flag = FTW_F, level = 1 -base = "/tmp/ftwtest.d/", file = "foo", flag = FTW_D, level = 1 -base = "/tmp/ftwtest.d/bar/", file = "xo", flag = FTW_F, level = 2 -base = "/tmp/ftwtest.d/foo/", file = "lvl1", flag = FTW_D, level = 2 -base = "/tmp/ftwtest.d/foo/", file = "lvl1b", flag = FTW_D, level = 2 -base = "/tmp/ftwtest.d/foo/lvl1b/", file = "file2@1b", flag = FTW_F, level = 3 -base = "/tmp/ftwtest.d/foo/lvl1b/", file = "file3@1b", flag = FTW_F, level = 3 -base = "/tmp/ftwtest.d/foo/lvl1b/", file = "file@1b", flag = FTW_F, level = 3 +base = "$tmp/", file = "ftwtest.d", flag = FTW_D, level = 0 +base = "$tmp/ftwtest.d/", file = "bar", flag = FTW_D, level = 1 +base = "$tmp/ftwtest.d/", file = "baz", flag = FTW_F, level = 1 +base = "$tmp/ftwtest.d/", file = "foo", flag = FTW_D, level = 1 +base = "$tmp/ftwtest.d/bar/", file = "xo", flag = FTW_F, level = 2 +base = "$tmp/ftwtest.d/foo/", file = "lvl1", flag = FTW_D, level = 2 +base = "$tmp/ftwtest.d/foo/", file = "lvl1b", flag = FTW_D, level = 2 +base = "$tmp/ftwtest.d/foo/lvl1b/", file = "file2@1b", flag = FTW_F, level = 3 +base = "$tmp/ftwtest.d/foo/lvl1b/", file = "file3@1b", flag = FTW_F, level = 3 +base = "$tmp/ftwtest.d/foo/lvl1b/", file = "file@1b", flag = FTW_F, level = 3 EOF rm $testout @@ -235,16 +235,16 @@ catcmd=cat && catcmd="grep -v lvl1b" $catcmd <<EOF | diff -u $testout - || exit 1 -base = "/tmp/", file = "ftwtest.d", flag = FTW_D, level = 0 -base = "/tmp/ftwtest.d/", file = "bar", flag = FTW_D, level = 1 -base = "/tmp/ftwtest.d/", file = "baz", flag = FTW_F, level = 1 -base = "/tmp/ftwtest.d/", file = "foo", flag = FTW_D, level = 1 -base = "/tmp/ftwtest.d/bar/", file = "xo", flag = FTW_F, level = 2 -base = "/tmp/ftwtest.d/foo/", file = "lvl1", flag = FTW_D, level = 2 -base = "/tmp/ftwtest.d/foo/", file = "lvl1b", flag = FTW_D, level = 2 -base = "/tmp/ftwtest.d/foo/lvl1b/", file = "file2@1b", flag = FTW_F, level = 3 -base = "/tmp/ftwtest.d/foo/lvl1b/", file = "file3@1b", flag = FTW_F, level = 3 -base = "/tmp/ftwtest.d/foo/lvl1b/", file = "file@1b", flag = FTW_F, level = 3 +base = "$tmp/", file = "ftwtest.d", flag = FTW_D, level = 0 +base = "$tmp/ftwtest.d/", file = "bar", flag = FTW_D, level = 1 +base = "$tmp/ftwtest.d/", file = "baz", flag = FTW_F, level = 1 +base = "$tmp/ftwtest.d/", file = "foo", flag = FTW_D, level = 1 +base = "$tmp/ftwtest.d/bar/", file = "xo", flag = FTW_F, level = 2 +base = "$tmp/ftwtest.d/foo/", file = "lvl1", flag = FTW_D, level = 2 +base = "$tmp/ftwtest.d/foo/", file = "lvl1b", flag = FTW_D, level = 2 +base = "$tmp/ftwtest.d/foo/lvl1b/", file = "file2@1b", flag = FTW_F, level = 3 +base = "$tmp/ftwtest.d/foo/lvl1b/", file = "file3@1b", flag = FTW_F, level = 3 +base = "$tmp/ftwtest.d/foo/lvl1b/", file = "file@1b", flag = FTW_F, level = 3 EOF rm $testout @@ -254,28 +254,28 @@ LD_LIBRARY_PATH=$objpfx $ldso $testprogram --skip-siblings=file@1b $tmpdir | # The filesystem is not required to put file2@1b and file3@1b after file@1b. # If file[23]@1b come after file@1b, it shouldn't be printed, while if they # come before, they should. -regexp=`echo $(ls -U /tmp/ftwtest.d/foo/lvl1b \ +regexp=`echo $(ls -U $tmp/ftwtest.d/foo/lvl1b \ | sed -n '/file@1b$/,${/file[23]@1b$/p;}') | sed 's, ,|,'` catcmd=cat [ -n "$regexp" ] && catcmd="egrep -v $regexp" $catcmd <<EOF | diff -u $testout - || exit 1 -base = "/tmp/", file = "ftwtest.d", flag = FTW_D, level = 0 -base = "/tmp/ftwtest.d/", file = "bar", flag = FTW_D, level = 1 -base = "/tmp/ftwtest.d/", file = "baz", flag = FTW_F, level = 1 -base = "/tmp/ftwtest.d/", file = "foo", flag = FTW_D, level = 1 -base = "/tmp/ftwtest.d/bar/", file = "xo", flag = FTW_F, level = 2 -base = "/tmp/ftwtest.d/foo/", file = "lvl1", flag = FTW_D, level = 2 -base = "/tmp/ftwtest.d/foo/", file = "lvl1b", flag = FTW_D, level = 2 -base = "/tmp/ftwtest.d/foo/lvl1/", file = "file@1", flag = FTW_F, level = 3 -base = "/tmp/ftwtest.d/foo/lvl1/", file = "link@1", flag = FTW_SLN, level = 3 -base = "/tmp/ftwtest.d/foo/lvl1/", file = "lvl2", flag = FTW_D, level = 3 -base = "/tmp/ftwtest.d/foo/lvl1/lvl2/", file = "file@2", flag = FTW_F, level = 4 -base = "/tmp/ftwtest.d/foo/lvl1/lvl2/", file = "lvl3", flag = FTW_D, level = 4 -base = "/tmp/ftwtest.d/foo/lvl1/lvl2/lvl3/", file = "file@3", flag = FTW_F, level = 5 -base = "/tmp/ftwtest.d/foo/lvl1b/", file = "file2@1b", flag = FTW_F, level = 3 -base = "/tmp/ftwtest.d/foo/lvl1b/", file = "file3@1b", flag = FTW_F, level = 3 -base = "/tmp/ftwtest.d/foo/lvl1b/", file = "file@1b", flag = FTW_F, level = 3 +base = "$tmp/", file = "ftwtest.d", flag = FTW_D, level = 0 +base = "$tmp/ftwtest.d/", file = "bar", flag = FTW_D, level = 1 +base = "$tmp/ftwtest.d/", file = "baz", flag = FTW_F, level = 1 +base = "$tmp/ftwtest.d/", file = "foo", flag = FTW_D, level = 1 +base = "$tmp/ftwtest.d/bar/", file = "xo", flag = FTW_F, level = 2 +base = "$tmp/ftwtest.d/foo/", file = "lvl1", flag = FTW_D, level = 2 +base = "$tmp/ftwtest.d/foo/", file = "lvl1b", flag = FTW_D, level = 2 +base = "$tmp/ftwtest.d/foo/lvl1/", file = "file@1", flag = FTW_F, level = 3 +base = "$tmp/ftwtest.d/foo/lvl1/", file = "link@1", flag = FTW_SLN, level = 3 +base = "$tmp/ftwtest.d/foo/lvl1/", file = "lvl2", flag = FTW_D, level = 3 +base = "$tmp/ftwtest.d/foo/lvl1/lvl2/", file = "file@2", flag = FTW_F, level = 4 +base = "$tmp/ftwtest.d/foo/lvl1/lvl2/", file = "lvl3", flag = FTW_D, level = 4 +base = "$tmp/ftwtest.d/foo/lvl1/lvl2/lvl3/", file = "file@3", flag = FTW_F, level = 5 +base = "$tmp/ftwtest.d/foo/lvl1b/", file = "file2@1b", flag = FTW_F, level = 3 +base = "$tmp/ftwtest.d/foo/lvl1b/", file = "file3@1b", flag = FTW_F, level = 3 +base = "$tmp/ftwtest.d/foo/lvl1b/", file = "file@1b", flag = FTW_F, level = 3 EOF rm $testout |