public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
From: Amir Goldstein <amir73il@gmail.com>
To: Eryu Guan <eguan@redhat.com>
Cc: Miklos Szeredi <miklos@szeredi.hu>, Xiong Zhou <xzhou@redhat.com>,
	linux-unionfs@vger.kernel.org, fstests@vger.kernel.org
Subject: [PATCH 3/5] overlay/017: create a helper to record inode number
Date: Thu, 27 Apr 2017 18:09:33 +0300	[thread overview]
Message-ID: <1493305775-12559-4-git-send-email-amir73il@gmail.com> (raw)
In-Reply-To: <1493305775-12559-1-git-send-email-amir73il@gmail.com>

helper records inode number and file basename, so the output
is independant of the files full path. This is needed for adding
rename test.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
 tests/overlay/017 | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/tests/overlay/017 b/tests/overlay/017
index 66a028f..f3bf454 100755
--- a/tests/overlay/017
+++ b/tests/overlay/017
@@ -41,6 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _cleanup()
 {
+	cd /
 	rm -f $tmp.*
 }
 
@@ -72,22 +73,41 @@ mknod $lowerdir/blkdev b 1 1
 mknod $lowerdir/fifo p
 $here/src/af_unix $lowerdir/socket
 
+FILES="dir file symlink chrdev blkdev fifo socket"
+
+# record inode numbers in format <ino> <basename>
+function record_inode_numbers()
+{
+	dir=$1
+	outfile=$2
+
+	for f in $FILES; do
+		ls -id $dir/$f
+	done | \
+	while read ino file; do
+		echo $ino `basename $file` >> $outfile
+	done
+}
+
 
 _scratch_mount
 
 
-rm -f $tmp.before $tmp.after
+rm -f $tmp.*
 
 # Test stable stat(2) st_ino
 
-# Record inode numbers before and after copy up
-for f in dir file symlink chrdev blkdev fifo socket; do
-	ls -id $SCRATCH_MNT/$f >> $tmp.before
+# Record inode numbers before copy up
+record_inode_numbers $SCRATCH_MNT $tmp.before
+
+for f in $FILES; do
 	# chown -h modifies all those file types
 	chown -h 100 $SCRATCH_MNT/$f
-	ls -id $SCRATCH_MNT/$f >> $tmp.after
 done
 
+# Record inode numbers after copy up
+record_inode_numbers $SCRATCH_MNT $tmp.after
+
 # Test stable readdir(3)/getdents(2) d_ino
 
 # find by inode number - expect to find file by inode number
-- 
2.7.4


  parent reply	other threads:[~2017-04-27 15:09 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-27 15:09 [PATCH 0/5] fstests: more tests for overlay constant inode numbers Amir Goldstein
2017-04-27 15:09 ` [PATCH 1/5] overlay/017: silence test output Amir Goldstein
2017-04-28  5:36   ` Eryu Guan
2017-04-28  5:45     ` Amir Goldstein
2017-04-28  5:50       ` Eryu Guan
2017-04-28  6:34         ` Amir Goldstein
2017-04-28  6:50           ` Eryu Guan
2017-04-27 15:09 ` [PATCH 2/5] overlay/017: use af_unix to create socket test file Amir Goldstein
2017-04-27 15:09 ` Amir Goldstein [this message]
2017-04-27 15:09 ` [PATCH 4/5] overlay/017: verify constant inode number after rename Amir Goldstein
2017-04-28  5:47   ` Eryu Guan
2017-04-28  5:50     ` Amir Goldstein
2017-04-27 15:09 ` [PATCH 5/5] overlay/017: test persistent inode numbers after mount cycle Amir Goldstein
2017-04-28  5:30 ` [PATCH 0/5] fstests: more tests for overlay constant inode numbers Eryu Guan
2017-04-28  5:39   ` Amir Goldstein

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1493305775-12559-4-git-send-email-amir73il@gmail.com \
    --to=amir73il@gmail.com \
    --cc=eguan@redhat.com \
    --cc=fstests@vger.kernel.org \
    --cc=linux-unionfs@vger.kernel.org \
    --cc=miklos@szeredi.hu \
    --cc=xzhou@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox