All of lore.kernel.org
 help / color / mirror / Atom feed
* [LTP] [PATCH 3/3] splice01/tee01/utime: test back on NFS
       [not found] <509126638.31210140.1410431519664.JavaMail.zimbra@redhat.com>
@ 2014-09-11 10:32 ` Xiong Zhou
  2014-09-11 14:48   ` Stanislav Kholmanskikh
  0 siblings, 1 reply; 5+ messages in thread
From: Xiong Zhou @ 2014-09-11 10:32 UTC (permalink / raw)
  To: ltp-list

NFS support splice(2) tee(2) and utime(2) now.

Signed-off-by: Xiong Zhou <xzhou@redhat.com>
---
 testcases/kernel/syscalls/splice/splice01.c | 5 -----
 testcases/kernel/syscalls/tee/tee01.c       | 5 -----
 testcases/kernel/syscalls/utime/utime01.c   | 1 -
 testcases/kernel/syscalls/utime/utime02.c   | 1 -
 testcases/kernel/syscalls/utime/utime03.c   | 1 -
 5 files changed, 13 deletions(-)

diff --git a/testcases/kernel/syscalls/splice/splice01.c b/testcases/kernel/syscalls/splice/splice01.c
index e96ff6d..7bd53b8 100644
--- a/testcases/kernel/syscalls/splice/splice01.c
+++ b/testcases/kernel/syscalls/splice/splice01.c
@@ -134,11 +134,6 @@ static void setup(void)
 
 	tst_tmpdir();
 
-	if (tst_fs_type(cleanup, ".") == TST_NFS_MAGIC) {
-		tst_brkm(TCONF, cleanup,
-			 "Cannot do splice on a file on NFS filesystem");
-	}
-
 	for (i = 0; i < TEST_BLOCK_SIZE; i++)
 		buffer[i] = i & 0xff;
 
diff --git a/testcases/kernel/syscalls/tee/tee01.c b/testcases/kernel/syscalls/tee/tee01.c
index 6ea6f18..f87df5d 100644
--- a/testcases/kernel/syscalls/tee/tee01.c
+++ b/testcases/kernel/syscalls/tee/tee01.c
@@ -146,11 +146,6 @@ static void setup(void)
 
 	tst_tmpdir();
 
-	if (tst_fs_type(cleanup, ".") == TST_NFS_MAGIC) {
-		tst_brkm(TCONF, cleanup,
-			 "Cannot do tee on a file on NFS filesystem");
-	}
-
 	for (i = 0; i < TEST_BLOCK_SIZE; i++)
 		buffer[i] = i & 0xff;
 
diff --git a/testcases/kernel/syscalls/utime/utime01.c b/testcases/kernel/syscalls/utime/utime01.c
index 3128965..4c41bc7 100644
--- a/testcases/kernel/syscalls/utime/utime01.c
+++ b/testcases/kernel/syscalls/utime/utime01.c
@@ -114,7 +114,6 @@ int main(int ac, char **av)
 	setup();
 
 	switch ((type = tst_fs_type(cleanup, "."))) {
-	case TST_NFS_MAGIC:
 	case TST_V9FS_MAGIC:
 		tst_brkm(TCONF, cleanup,
 			 "Cannot do utime on a file on %s filesystem",
diff --git a/testcases/kernel/syscalls/utime/utime02.c b/testcases/kernel/syscalls/utime/utime02.c
index cbd30da..6624695 100644
--- a/testcases/kernel/syscalls/utime/utime02.c
+++ b/testcases/kernel/syscalls/utime/utime02.c
@@ -120,7 +120,6 @@ int main(int ac, char **av)
 	setup();
 
 	switch ((type = tst_fs_type(cleanup, "."))) {
-	case TST_NFS_MAGIC:
 	case TST_V9FS_MAGIC:
 		tst_brkm(TCONF, cleanup,
 			 "Cannot do utime on a file on %s filesystem",
diff --git a/testcases/kernel/syscalls/utime/utime03.c b/testcases/kernel/syscalls/utime/utime03.c
index 858f6ca..32b0d29 100644
--- a/testcases/kernel/syscalls/utime/utime03.c
+++ b/testcases/kernel/syscalls/utime/utime03.c
@@ -130,7 +130,6 @@ int main(int ac, char **av)
 	setup();
 
 	switch ((type = tst_fs_type(cleanup, "."))) {
-	case TST_NFS_MAGIC:
 	case TST_V9FS_MAGIC:
 		tst_brkm(TCONF, cleanup,
 			 "Cannot do utime on a file on %s filesystem",
-- 
1.8.3.1


------------------------------------------------------------------------------
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [LTP] [PATCH 3/3] splice01/tee01/utime: test back on NFS
  2014-09-11 10:32 ` [LTP] [PATCH 3/3] splice01/tee01/utime: test back on NFS Xiong Zhou
@ 2014-09-11 14:48   ` Stanislav Kholmanskikh
  2014-09-19  6:49     ` [LTP] [PATCH v2 " Xiong Zhou
  0 siblings, 1 reply; 5+ messages in thread
From: Stanislav Kholmanskikh @ 2014-09-11 14:48 UTC (permalink / raw)
  To: Xiong Zhou, ltp-list

Hi!

On 09/11/2014 02:32 PM, Xiong Zhou wrote:
> NFS support splice(2) tee(2) and utime(2) now.

I think that 'now' is a bit relative. I.e. for me 'now'
can be 2.6.39, but for another guy - 3.16.2 or whatever.

My proposal:
  * if this support came many-many years ago, we just mark the fact in 
the description
  * if this support came recently, we have to add a kernel check in the 
tests


>
> Signed-off-by: Xiong Zhou <xzhou@redhat.com>
> ---
>   testcases/kernel/syscalls/splice/splice01.c | 5 -----
>   testcases/kernel/syscalls/tee/tee01.c       | 5 -----
>   testcases/kernel/syscalls/utime/utime01.c   | 1 -
>   testcases/kernel/syscalls/utime/utime02.c   | 1 -
>   testcases/kernel/syscalls/utime/utime03.c   | 1 -
>   5 files changed, 13 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/splice/splice01.c b/testcases/kernel/syscalls/splice/splice01.c
> index e96ff6d..7bd53b8 100644
> --- a/testcases/kernel/syscalls/splice/splice01.c
> +++ b/testcases/kernel/syscalls/splice/splice01.c
> @@ -134,11 +134,6 @@ static void setup(void)
>
>   	tst_tmpdir();
>
> -	if (tst_fs_type(cleanup, ".") == TST_NFS_MAGIC) {
> -		tst_brkm(TCONF, cleanup,
> -			 "Cannot do splice on a file on NFS filesystem");
> -	}
> -
>   	for (i = 0; i < TEST_BLOCK_SIZE; i++)
>   		buffer[i] = i & 0xff;
>
> diff --git a/testcases/kernel/syscalls/tee/tee01.c b/testcases/kernel/syscalls/tee/tee01.c
> index 6ea6f18..f87df5d 100644
> --- a/testcases/kernel/syscalls/tee/tee01.c
> +++ b/testcases/kernel/syscalls/tee/tee01.c
> @@ -146,11 +146,6 @@ static void setup(void)
>
>   	tst_tmpdir();
>
> -	if (tst_fs_type(cleanup, ".") == TST_NFS_MAGIC) {
> -		tst_brkm(TCONF, cleanup,
> -			 "Cannot do tee on a file on NFS filesystem");
> -	}
> -
>   	for (i = 0; i < TEST_BLOCK_SIZE; i++)
>   		buffer[i] = i & 0xff;
>
> diff --git a/testcases/kernel/syscalls/utime/utime01.c b/testcases/kernel/syscalls/utime/utime01.c
> index 3128965..4c41bc7 100644
> --- a/testcases/kernel/syscalls/utime/utime01.c
> +++ b/testcases/kernel/syscalls/utime/utime01.c
> @@ -114,7 +114,6 @@ int main(int ac, char **av)
>   	setup();
>
>   	switch ((type = tst_fs_type(cleanup, "."))) {
> -	case TST_NFS_MAGIC:
>   	case TST_V9FS_MAGIC:
>   		tst_brkm(TCONF, cleanup,
>   			 "Cannot do utime on a file on %s filesystem",
> diff --git a/testcases/kernel/syscalls/utime/utime02.c b/testcases/kernel/syscalls/utime/utime02.c
> index cbd30da..6624695 100644
> --- a/testcases/kernel/syscalls/utime/utime02.c
> +++ b/testcases/kernel/syscalls/utime/utime02.c
> @@ -120,7 +120,6 @@ int main(int ac, char **av)
>   	setup();
>
>   	switch ((type = tst_fs_type(cleanup, "."))) {
> -	case TST_NFS_MAGIC:
>   	case TST_V9FS_MAGIC:
>   		tst_brkm(TCONF, cleanup,
>   			 "Cannot do utime on a file on %s filesystem",
> diff --git a/testcases/kernel/syscalls/utime/utime03.c b/testcases/kernel/syscalls/utime/utime03.c
> index 858f6ca..32b0d29 100644
> --- a/testcases/kernel/syscalls/utime/utime03.c
> +++ b/testcases/kernel/syscalls/utime/utime03.c
> @@ -130,7 +130,6 @@ int main(int ac, char **av)
>   	setup();
>
>   	switch ((type = tst_fs_type(cleanup, "."))) {
> -	case TST_NFS_MAGIC:
>   	case TST_V9FS_MAGIC:
>   		tst_brkm(TCONF, cleanup,
>   			 "Cannot do utime on a file on %s filesystem",
>

------------------------------------------------------------------------------
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [LTP]  [PATCH v2 3/3] splice01/tee01/utime: test back on NFS
  2014-09-11 14:48   ` Stanislav Kholmanskikh
@ 2014-09-19  6:49     ` Xiong Zhou
  2014-09-23 11:52       ` Stanislav Kholmanskikh
  2014-09-25  7:24       ` [LTP] [PATCH v3 3/3] splice01/tee01/utime: add kernel version check for NFS test Xiong Zhou
  0 siblings, 2 replies; 5+ messages in thread
From: Xiong Zhou @ 2014-09-19  6:49 UTC (permalink / raw)
  To: Stanislav Kholmanskikh; +Cc: ltp-list


Tests splice01 tee01 and utime01/02/03 pass on NFS since 2.6.32 at least.

Signed-off-by: Xiong Zhou <xzhou@redhat.com>
---
 testcases/kernel/syscalls/splice/splice01.c | 5 -----
 testcases/kernel/syscalls/tee/tee01.c       | 5 -----
 testcases/kernel/syscalls/utime/utime01.c   | 1 -
 testcases/kernel/syscalls/utime/utime02.c   | 1 -
 testcases/kernel/syscalls/utime/utime03.c   | 1 -
 5 files changed, 13 deletions(-)

diff --git a/testcases/kernel/syscalls/splice/splice01.c b/testcases/kernel/syscalls/splice/splice01.c
index e96ff6d..7bd53b8 100644
--- a/testcases/kernel/syscalls/splice/splice01.c
+++ b/testcases/kernel/syscalls/splice/splice01.c
@@ -134,11 +134,6 @@ static void setup(void)
 
 	tst_tmpdir();
 
-	if (tst_fs_type(cleanup, ".") == TST_NFS_MAGIC) {
-		tst_brkm(TCONF, cleanup,
-			 "Cannot do splice on a file on NFS filesystem");
-	}
-
 	for (i = 0; i < TEST_BLOCK_SIZE; i++)
 		buffer[i] = i & 0xff;
 
diff --git a/testcases/kernel/syscalls/tee/tee01.c b/testcases/kernel/syscalls/tee/tee01.c
index 6ea6f18..f87df5d 100644
--- a/testcases/kernel/syscalls/tee/tee01.c
+++ b/testcases/kernel/syscalls/tee/tee01.c
@@ -146,11 +146,6 @@ static void setup(void)
 
 	tst_tmpdir();
 
-	if (tst_fs_type(cleanup, ".") == TST_NFS_MAGIC) {
-		tst_brkm(TCONF, cleanup,
-			 "Cannot do tee on a file on NFS filesystem");
-	}
-
 	for (i = 0; i < TEST_BLOCK_SIZE; i++)
 		buffer[i] = i & 0xff;
 
diff --git a/testcases/kernel/syscalls/utime/utime01.c b/testcases/kernel/syscalls/utime/utime01.c
index 3128965..4c41bc7 100644
--- a/testcases/kernel/syscalls/utime/utime01.c
+++ b/testcases/kernel/syscalls/utime/utime01.c
@@ -114,7 +114,6 @@ int main(int ac, char **av)
 	setup();
 
 	switch ((type = tst_fs_type(cleanup, "."))) {
-	case TST_NFS_MAGIC:
 	case TST_V9FS_MAGIC:
 		tst_brkm(TCONF, cleanup,
 			 "Cannot do utime on a file on %s filesystem",
diff --git a/testcases/kernel/syscalls/utime/utime02.c b/testcases/kernel/syscalls/utime/utime02.c
index cbd30da..6624695 100644
--- a/testcases/kernel/syscalls/utime/utime02.c
+++ b/testcases/kernel/syscalls/utime/utime02.c
@@ -120,7 +120,6 @@ int main(int ac, char **av)
 	setup();
 
 	switch ((type = tst_fs_type(cleanup, "."))) {
-	case TST_NFS_MAGIC:
 	case TST_V9FS_MAGIC:
 		tst_brkm(TCONF, cleanup,
 			 "Cannot do utime on a file on %s filesystem",
diff --git a/testcases/kernel/syscalls/utime/utime03.c b/testcases/kernel/syscalls/utime/utime03.c
index 858f6ca..32b0d29 100644
--- a/testcases/kernel/syscalls/utime/utime03.c
+++ b/testcases/kernel/syscalls/utime/utime03.c
@@ -130,7 +130,6 @@ int main(int ac, char **av)
 	setup();
 
 	switch ((type = tst_fs_type(cleanup, "."))) {
-	case TST_NFS_MAGIC:
 	case TST_V9FS_MAGIC:
 		tst_brkm(TCONF, cleanup,
 			 "Cannot do utime on a file on %s filesystem",
-- 
1.8.3.1


------------------------------------------------------------------------------
Slashdot TV.  Video for Nerds.  Stuff that Matters.
http://pubads.g.doubleclick.net/gampad/clk?id=160591471&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [LTP] [PATCH v2 3/3] splice01/tee01/utime: test back on NFS
  2014-09-19  6:49     ` [LTP] [PATCH v2 " Xiong Zhou
@ 2014-09-23 11:52       ` Stanislav Kholmanskikh
  2014-09-25  7:24       ` [LTP] [PATCH v3 3/3] splice01/tee01/utime: add kernel version check for NFS test Xiong Zhou
  1 sibling, 0 replies; 5+ messages in thread
From: Stanislav Kholmanskikh @ 2014-09-23 11:52 UTC (permalink / raw)
  To: Xiong Zhou; +Cc: ltp-list

Hi!

On 09/19/2014 10:49 AM, Xiong Zhou wrote:
>
> Tests splice01 tee01 and utime01/02/03 pass on NFS since 2.6.32 at least.

Could you add a kernel version check to the patch, please?

I'm sure there are distributions which still use older kernels.

For example, with 2.6.18-371.3.1.0.1.el5 and:
splice01 - fails
tee01 - fails
utime01/utime02/utime03 - pass

Thanks.


>
> Signed-off-by: Xiong Zhou <xzhou@redhat.com>
> ---
>   testcases/kernel/syscalls/splice/splice01.c | 5 -----
>   testcases/kernel/syscalls/tee/tee01.c       | 5 -----
>   testcases/kernel/syscalls/utime/utime01.c   | 1 -
>   testcases/kernel/syscalls/utime/utime02.c   | 1 -
>   testcases/kernel/syscalls/utime/utime03.c   | 1 -
>   5 files changed, 13 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/splice/splice01.c b/testcases/kernel/syscalls/splice/splice01.c
> index e96ff6d..7bd53b8 100644
> --- a/testcases/kernel/syscalls/splice/splice01.c
> +++ b/testcases/kernel/syscalls/splice/splice01.c
> @@ -134,11 +134,6 @@ static void setup(void)
>
>   	tst_tmpdir();
>
> -	if (tst_fs_type(cleanup, ".") == TST_NFS_MAGIC) {
> -		tst_brkm(TCONF, cleanup,
> -			 "Cannot do splice on a file on NFS filesystem");
> -	}
> -
>   	for (i = 0; i < TEST_BLOCK_SIZE; i++)
>   		buffer[i] = i & 0xff;
>
> diff --git a/testcases/kernel/syscalls/tee/tee01.c b/testcases/kernel/syscalls/tee/tee01.c
> index 6ea6f18..f87df5d 100644
> --- a/testcases/kernel/syscalls/tee/tee01.c
> +++ b/testcases/kernel/syscalls/tee/tee01.c
> @@ -146,11 +146,6 @@ static void setup(void)
>
>   	tst_tmpdir();
>
> -	if (tst_fs_type(cleanup, ".") == TST_NFS_MAGIC) {
> -		tst_brkm(TCONF, cleanup,
> -			 "Cannot do tee on a file on NFS filesystem");
> -	}
> -
>   	for (i = 0; i < TEST_BLOCK_SIZE; i++)
>   		buffer[i] = i & 0xff;
>
> diff --git a/testcases/kernel/syscalls/utime/utime01.c b/testcases/kernel/syscalls/utime/utime01.c
> index 3128965..4c41bc7 100644
> --- a/testcases/kernel/syscalls/utime/utime01.c
> +++ b/testcases/kernel/syscalls/utime/utime01.c
> @@ -114,7 +114,6 @@ int main(int ac, char **av)
>   	setup();
>
>   	switch ((type = tst_fs_type(cleanup, "."))) {
> -	case TST_NFS_MAGIC:
>   	case TST_V9FS_MAGIC:
>   		tst_brkm(TCONF, cleanup,
>   			 "Cannot do utime on a file on %s filesystem",
> diff --git a/testcases/kernel/syscalls/utime/utime02.c b/testcases/kernel/syscalls/utime/utime02.c
> index cbd30da..6624695 100644
> --- a/testcases/kernel/syscalls/utime/utime02.c
> +++ b/testcases/kernel/syscalls/utime/utime02.c
> @@ -120,7 +120,6 @@ int main(int ac, char **av)
>   	setup();
>
>   	switch ((type = tst_fs_type(cleanup, "."))) {
> -	case TST_NFS_MAGIC:
>   	case TST_V9FS_MAGIC:
>   		tst_brkm(TCONF, cleanup,
>   			 "Cannot do utime on a file on %s filesystem",
> diff --git a/testcases/kernel/syscalls/utime/utime03.c b/testcases/kernel/syscalls/utime/utime03.c
> index 858f6ca..32b0d29 100644
> --- a/testcases/kernel/syscalls/utime/utime03.c
> +++ b/testcases/kernel/syscalls/utime/utime03.c
> @@ -130,7 +130,6 @@ int main(int ac, char **av)
>   	setup();
>
>   	switch ((type = tst_fs_type(cleanup, "."))) {
> -	case TST_NFS_MAGIC:
>   	case TST_V9FS_MAGIC:
>   		tst_brkm(TCONF, cleanup,
>   			 "Cannot do utime on a file on %s filesystem",
>

------------------------------------------------------------------------------
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [LTP] [PATCH v3 3/3] splice01/tee01/utime: add kernel version check for NFS test
  2014-09-19  6:49     ` [LTP] [PATCH v2 " Xiong Zhou
  2014-09-23 11:52       ` Stanislav Kholmanskikh
@ 2014-09-25  7:24       ` Xiong Zhou
  1 sibling, 0 replies; 5+ messages in thread
From: Xiong Zhou @ 2014-09-25  7:24 UTC (permalink / raw)
  To: Stanislav Kholmanskikh, ltp-list


Tests splice01 tee01 pass on NFS since 2.6.32 at least,
and utime01/02/03 pass since 2.6.18 at least.

Signed-off-by: Xiong Zhou <xzhou@redhat.com>
---
 testcases/kernel/syscalls/splice/splice01.c | 5 +++--
 testcases/kernel/syscalls/tee/tee01.c       | 5 +++--
 testcases/kernel/syscalls/utime/utime01.c   | 7 ++++++-
 testcases/kernel/syscalls/utime/utime02.c   | 7 ++++++-
 testcases/kernel/syscalls/utime/utime03.c   | 7 ++++++-
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/testcases/kernel/syscalls/splice/splice01.c b/testcases/kernel/syscalls/splice/splice01.c
index e96ff6d..8896638 100644
--- a/testcases/kernel/syscalls/splice/splice01.c
+++ b/testcases/kernel/syscalls/splice/splice01.c
@@ -135,8 +135,9 @@ static void setup(void)
 	tst_tmpdir();
 
 	if (tst_fs_type(cleanup, ".") == TST_NFS_MAGIC) {
-		tst_brkm(TCONF, cleanup,
-			 "Cannot do splice on a file on NFS filesystem");
+		if  (tst_kvercmp(2, 6, 32) < 0)
+			tst_brkm(TCONF, cleanup, "Cannot do splice on a file"
+				" on NFS filesystem before 2.6.32");
 	}
 
 	for (i = 0; i < TEST_BLOCK_SIZE; i++)
diff --git a/testcases/kernel/syscalls/tee/tee01.c b/testcases/kernel/syscalls/tee/tee01.c
index 6ea6f18..3ba0804 100644
--- a/testcases/kernel/syscalls/tee/tee01.c
+++ b/testcases/kernel/syscalls/tee/tee01.c
@@ -147,8 +147,9 @@ static void setup(void)
 	tst_tmpdir();
 
 	if (tst_fs_type(cleanup, ".") == TST_NFS_MAGIC) {
-		tst_brkm(TCONF, cleanup,
-			 "Cannot do tee on a file on NFS filesystem");
+		if ((tst_kvercmp(2, 6, 32)) < 0)
+			tst_brkm(TCONF, cleanup, "Cannot do tee on a file"
+				" on NFS filesystem before 2.6.32");
 	}
 
 	for (i = 0; i < TEST_BLOCK_SIZE; i++)
diff --git a/testcases/kernel/syscalls/utime/utime01.c b/testcases/kernel/syscalls/utime/utime01.c
index 3128965..0e0165d 100644
--- a/testcases/kernel/syscalls/utime/utime01.c
+++ b/testcases/kernel/syscalls/utime/utime01.c
@@ -115,11 +115,16 @@ int main(int ac, char **av)
 
 	switch ((type = tst_fs_type(cleanup, "."))) {
 	case TST_NFS_MAGIC:
+		if (tst_kvercmp(2, 6, 18) < 0)
+			tst_brkm(TCONF, cleanup, "Cannot do utime on a file"
+				" on %s filesystem before 2.6.18",
+				 tst_fs_type_name(type));
+		break;
 	case TST_V9FS_MAGIC:
 		tst_brkm(TCONF, cleanup,
 			 "Cannot do utime on a file on %s filesystem",
 			 tst_fs_type_name(type));
-	break;
+		break;
 	}
 
 	/* set the expected errnos... */
diff --git a/testcases/kernel/syscalls/utime/utime02.c b/testcases/kernel/syscalls/utime/utime02.c
index cbd30da..aeaf6d6 100644
--- a/testcases/kernel/syscalls/utime/utime02.c
+++ b/testcases/kernel/syscalls/utime/utime02.c
@@ -121,11 +121,16 @@ int main(int ac, char **av)
 
 	switch ((type = tst_fs_type(cleanup, "."))) {
 	case TST_NFS_MAGIC:
+		if (tst_kvercmp(2, 6, 18) < 0)
+			tst_brkm(TCONF, cleanup, "Cannot do utime on a file"
+				" on %s filesystem before 2.6.18",
+				 tst_fs_type_name(type));
+		break;
 	case TST_V9FS_MAGIC:
 		tst_brkm(TCONF, cleanup,
 			 "Cannot do utime on a file on %s filesystem",
 			 tst_fs_type_name(type));
-	break;
+		break;
 	}
 
 	/* set the expected errnos... */
diff --git a/testcases/kernel/syscalls/utime/utime03.c b/testcases/kernel/syscalls/utime/utime03.c
index 858f6ca..da1bf78 100644
--- a/testcases/kernel/syscalls/utime/utime03.c
+++ b/testcases/kernel/syscalls/utime/utime03.c
@@ -131,11 +131,16 @@ int main(int ac, char **av)
 
 	switch ((type = tst_fs_type(cleanup, "."))) {
 	case TST_NFS_MAGIC:
+		if (tst_kvercmp(2, 6, 18) < 0)
+			tst_brkm(TCONF, cleanup, "Cannot do utime on a file"
+				" on %s filesystem before 2.6.18",
+				 tst_fs_type_name(type));
+		break;
 	case TST_V9FS_MAGIC:
 		tst_brkm(TCONF, cleanup,
 			 "Cannot do utime on a file on %s filesystem",
 			 tst_fs_type_name(type));
-	break;
+		break;
 	}
 
 	/* set the expected errnos... */
-- 
1.8.3.1


------------------------------------------------------------------------------
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2014-09-25  7:24 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <509126638.31210140.1410431519664.JavaMail.zimbra@redhat.com>
2014-09-11 10:32 ` [LTP] [PATCH 3/3] splice01/tee01/utime: test back on NFS Xiong Zhou
2014-09-11 14:48   ` Stanislav Kholmanskikh
2014-09-19  6:49     ` [LTP] [PATCH v2 " Xiong Zhou
2014-09-23 11:52       ` Stanislav Kholmanskikh
2014-09-25  7:24       ` [LTP] [PATCH v3 3/3] splice01/tee01/utime: add kernel version check for NFS test Xiong Zhou

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.