linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Gu Jinxiang <gujx@cn.fujitsu.com>
To: <linux-btrfs@vger.kernel.org>
Cc: <dsterba@suse.cz>, <quwenruo.btrfs@gmx.com>
Subject: [RFC PATCH v2 3/4] btrfs-progs: Modify rootdir files when use mkfs.btrfs
Date: Fri, 2 Feb 2018 16:34:04 +0800	[thread overview]
Message-ID: <1517560445-5712-4-git-send-email-gujx@cn.fujitsu.com> (raw)
In-Reply-To: <1517560445-5712-1-git-send-email-gujx@cn.fujitsu.com>

Since there is no $TOP/Documentation file after package the testsuite.
So use a common file that is usually exsits.

Signed-off-by: Gu Jinxiang <gujx@cn.fujitsu.com>
---
 tests/misc-tests/002-uuid-rewrite/test.sh       | 4 ++--
 tests/misc-tests/003-zero-log/test.sh           | 2 +-
 tests/mkfs-tests/004-rootdir-keeps-size/test.sh | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/misc-tests/002-uuid-rewrite/test.sh b/tests/misc-tests/002-uuid-rewrite/test.sh
index 158bda90..27341322 100755
--- a/tests/misc-tests/002-uuid-rewrite/test.sh
+++ b/tests/misc-tests/002-uuid-rewrite/test.sh
@@ -25,7 +25,7 @@ test_uuid_random()
 
 	run_check $SUDO_HELPER $EXEC/mkfs.btrfs -f \
 		--uuid $origuuid \
-		--rootdir $TOP/Documentation \
+		--rootdir /lib/modules/`uname -r`/ \
 		$TEST_DEV
 	run_check $EXEC/btrfs inspect-internal dump-super "$TEST_DEV"
 	currentfsid=$(run_check_stdout $EXEC/btrfstune -f -u $TEST_DEV | \
@@ -47,7 +47,7 @@ test_uuid_user()
 
 	run_check $SUDO_HELPER $EXEC/mkfs.btrfs -f \
 		--uuid $origuuid \
-		--rootdir $TOP/Documentation \
+		--rootdir /lib/modules/`uname -r`/ \
 		$TEST_DEV
 	run_check $EXEC/btrfs inspect-internal dump-super "$TEST_DEV"
 	run_check $EXEC/btrfstune -f -U $newuuid \
diff --git a/tests/misc-tests/003-zero-log/test.sh b/tests/misc-tests/003-zero-log/test.sh
index 0f3d3cd6..db1b1c67 100755
--- a/tests/misc-tests/003-zero-log/test.sh
+++ b/tests/misc-tests/003-zero-log/test.sh
@@ -27,7 +27,7 @@ test_zero_log()
 {
 	# FIXME: we need an image with existing log_root
 	run_check $SUDO_HELPER $EXEC/mkfs.btrfs -f \
-		--rootdir $TOP/Documentation \
+		--rootdir /lib/modules/`uname -r`/ \
 		$TEST_DEV
 	run_check $EXEC/btrfs inspect-internal dump-super $TEST_DEV
 	if [ "$1" = 'standalone' ]; then
diff --git a/tests/mkfs-tests/004-rootdir-keeps-size/test.sh b/tests/mkfs-tests/004-rootdir-keeps-size/test.sh
index c8d920a5..3c53a1a7 100755
--- a/tests/mkfs-tests/004-rootdir-keeps-size/test.sh
+++ b/tests/mkfs-tests/004-rootdir-keeps-size/test.sh
@@ -16,7 +16,7 @@ test_mkfs_with_size() {
 	run_check truncate -s$size $TEST_DEV
 	imgsize=$(run_check_stdout stat --format=%s $TEST_DEV)
 	run_check $SUDO_HELPER $EXEC/mkfs.btrfs -f \
-		--rootdir $EXEC/Documentation \
+		--rootdir /lib/modules/`uname -r`/ \
 		$TEST_DEV
 	tmp=$(run_check_stdout stat --format=%s $TEST_DEV)
 	if ! [ "$imgsize" = "$tmp" ]; then
-- 
2.14.3




  parent reply	other threads:[~2018-02-02  8:34 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-02  8:34 [RFC PATCH v2 0/4] Add support for export testsuits Gu Jinxiang
2018-02-02  8:34 ` [RFC PATCH v2 1/4] btrfs-progs: Add package command for packaging tests Gu Jinxiang
2018-02-02  8:34 ` [RFC PATCH v2 2/4] btrfs-progs: Add EXEC represent path of executable file Gu Jinxiang
2018-02-02 18:07   ` David Sterba
2018-02-03  9:07     ` Gu, Jinxiang
2018-02-05 17:17       ` David Sterba
2018-02-02  8:34 ` Gu Jinxiang [this message]
2018-02-02 18:11   ` [RFC PATCH v2 3/4] btrfs-progs: Modify rootdir files when use mkfs.btrfs David Sterba
2018-02-02  8:34 ` [RFC PATCH v2 4/4] btrfs-progs: Add readme for export testsuits Gu Jinxiang
2018-02-02 10:41 ` [RFC PATCH v2 0/4] Add support " Nikolay Borisov
2018-02-02 10:59   ` Qu Wenruo
2018-02-02 18:47 ` David Sterba

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=1517560445-5712-4-git-send-email-gujx@cn.fujitsu.com \
    --to=gujx@cn.fujitsu.com \
    --cc=dsterba@suse.cz \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=quwenruo.btrfs@gmx.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;
as well as URLs for NNTP newsgroup(s).