sockioctl01 test case fix

PATCH Superseded Nageswara R Sastry 2 participants 2 messages Sep 5, 2011 – Sep 9, 2011

lore

Share & tools

lore

Nageswara R Sastry

author

2011-09-05 10:18 UTC #0 lore raw

PATCH 1/1 sockioctl01 test case fix

In sockioctl01 testcase,
Current 'inappropriate ioctl operation returning EINVAL'

With the git commit '41c31f318a5209922d051e293c61e4724daad11c' more details at http://permalink.gmane.org/gmane.linux.kernel.commits.head/296060

'inappropriate ioctl operation returning ENOTTY'

The following patch will fix this.

sockioctl01:
Before patch:
...
sockioctl01 4 TFAIL : ATMARK on UDP ; returned -1 (expected -1), errno 25 (expected 22)
...

After patch:
...
sockioctl01 4 TPASS : ATMARK on UDP successful
...

Signed-off-by Nageswara R Sastry <[email protected]>

Signature · 2 lines

Regards
R.Nageswara Sastry

testcases/kernel/syscalls/sockioctl/sockioctl01.c +7 -1

@@ -227,6 +227,12 @@ void setup1(void)
 			 strerror(errno));
 	}
 	sinlen = sizeof(fsin1);
+
+	if (strncmp(tdat[testno].desc, "ATMARK on UDP", 14) == 0) {
+                if ( tst_kvercmp(2,6,39) >= 0 || tst_kvercmp(3,0,0) >= 0 ) {
+                        tdat[testno].experrno = ENOTTY;
+                }
+        }
 }
 
 void setup2(void)

@@ -254,4 +260,4 @@ void cleanup1(void)
 {
 	(void)close(s);
 	s = -1;
-}
\ No newline at end of file
+}

------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE! Finally, a world-class log management solution at an even better price-free! And you'll get a free "Love Thy Logs" t-shirt when you download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev

_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

Cyril Hrubis

2011-09-09 11:02 UTC #1 lore raw

Hi!

Quoted 36 lines

sockioctl01:
Before patch:
...
sockioctl01 4 TFAIL : ATMARK on UDP ; returned -1 (expected
-1), errno 25 (expected 22)
...
After patch:
...
sockioctl01 4 TPASS : ATMARK on UDP successful
...
Signed-off-by Nageswara R Sastry <[email protected]>
Signature · 2 lines
Regards
R.Nageswara Sastry
testcases/kernel/syscalls/sockioctl/sockioctl01.c +6 -0
@@ -227,6 +227,12 @@ void setup1(void)
 			 strerror(errno));
 	}
 	sinlen = sizeof(fsin1);
+
+	if (strncmp(tdat[testno].desc, "ATMARK on UDP", 14) == 0) {
+                if ( tst_kvercmp(2,6,39) >= 0 || tst_kvercmp(3,0,0) >= 0 ) {
+                        tdat[testno].experrno = ENOTTY;
+                }
+        }
 }
 
 void setup2(void)

testcases/kernel/syscalls/sockioctl/sockioctl01.c void cleanup1(void) · line 263

Quoted 6 lines

testcases/kernel/syscalls/sockioctl/sockioctl01.c +1 -1

@@ -254,4 +260,4 @@ void cleanup1(void)
 {
 	(void)close(s);
 	s = -1;
-}
\ No newline at end of file
+}

Same as the previous one.

Signature · 13 lines

Cyril Hrubis
[email protected]

------------------------------------------------------------------------------
Why Cloud-Based Security and Archiving Make Sense
Osterman Research conducted this study that outlines how and why cloud
computing security and archiving is rapidly being adopted across the IT 
space for its ease of implementation, lower cost, and increased 
reliability. Learn more. http://www.accelacomm.com/jaw/sfnl/114/51425301/
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list