]> git.apps.os.sepia.ceph.com Git - xfstests-dev.git/commit
xfstests: fix _mount_ops_filter() to support $TEST_DIR containing -o
authorKoen De Wit <koen.de.wit@oracle.com>
Tue, 2 Jul 2013 21:44:57 +0000 (21:44 +0000)
committerRich Johnston <rjohnston@sgi.com>
Thu, 15 Aug 2013 16:27:54 +0000 (11:27 -0500)
commit74357dea4a975d2942163a2df7a527b57c46650b
treee575fe6c62a18e2e1104de65e60fcd3ceb4cfd93
parentf3df3fab7d3870aab222512126b06668d7db5d71
xfstests: fix _mount_ops_filter() to support $TEST_DIR containing -o

If multiple mount options are given with multiple -o parameters,
_mount_ops_filter concatenates them by replacing all -o's with a comma
(except for the first -o).

If $TEST_DIR contains "-o" (e.g. /mnt/test-os/) you get errors like this:

   # ./check generic/002
     mount: mount point /mnt/test,s/ does not exist
     common/rc: retrying test device mount with external set
     mount: mount point /mnt/test,s/ does not exist
     common/rc: could not mount /dev/sdc3 on /mnt/test-os/

Fix it by only replacing -o's that are preceded by at least one space.

Signed-off-by: Koen De Wit <koen.de.wit@oracle.com>
Reviewed-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
common/rc