[LTP] [PATCH] Fix temporary file creation in mmapstress tests

[LTP] [PATCH] Fix temporary file creation in mmapstress tests

[Jiri Palecek]

Hello,

these are two little fixes of the mmapstress test.

 - the mkstemp() function returns -1 on error; the tests treat 0 as
   error instead

 - mkstemp() returns a file descriptor; no need to open the file once
   more later

Regards
    Jiri Palecek

Signed-off-by: Jiri Palecek <jpalecek@web.de>
---
 testcases/kernel/mem/mmapstress/mmapstress02.c |    6 +-----
 testcases/kernel/mem/mmapstress/mmapstress05.c |    6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/testcases/kernel/mem/mmapstress/mmapstress02.c b/testcases/kernel/mem/mmapstress/mmapstress02.c
index a0f0693..f801a2e 100644
--- a/testcases/kernel/mem/mmapstress/mmapstress02.c
+++ b/testcases/kernel/mem/mmapstress/mmapstress02.c
@@ -101,7 +101,7 @@ main(int argc, char *argv[]) {
 		return 1;
 	}
 	(void)time(&t);
-	if (!(fd = mkstemp(tmpname))) {
+	if ((fd = mkstemp(tmpname)) == -1) {
 		ERROR("mkstemp failed");
 		anyfail();
 	}
@@ -114,10 +114,6 @@ main(int argc, char *argv[]) {
         CATCH_SIG(SIGINT);
         CATCH_SIG(SIGQUIT);
         CATCH_SIG(SIGTERM);
-	if ((fd = open(tmpname, O_CREAT|O_RDWR, 0777)) == -1) {
-		ERROR("couldn't open temporary file");
-		anyfail();
-	}
 	if (sbrk(2*pagesize - ((ulong)sbrk(0) & (pagesize-1))) == (char *)-1) {
 		CLEANERROR("couldn't round up brk");
 		anyfail();
diff --git a/testcases/kernel/mem/mmapstress/mmapstress05.c b/testcases/kernel/mem/mmapstress/mmapstress05.c
index 9155834..4d25b8d 100644
--- a/testcases/kernel/mem/mmapstress/mmapstress05.c
+++ b/testcases/kernel/mem/mmapstress/mmapstress05.c
@@ -133,7 +133,7 @@ main(int argc, char *argv[])
 	-- sreeni
 	*/
 
-	if (!(fd = mkstemp(tmpname))) {
+	if ((fd = mkstemp(tmpname))==-1) {
 		ERROR("mkstemp failed");
 		anyfail();
 	}
@@ -146,10 +146,6 @@ main(int argc, char *argv[])
 	CATCH_SIG(SIGINT);
         CATCH_SIG(SIGQUIT);
         CATCH_SIG(SIGTERM);
-	if ((fd = open(tmpname, O_RDWR|O_CREAT, 0777)) == -1) {
-		ERROR("open failed");
-		anyfail();
-	}
 	for (i = 0; i < pagesize; i++)
 		buf[i] = 'a';
 	if (write(fd, buf, pagesize) != pagesize) {
-- 
1.6.4.3




------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH] Fix temporary file creation in mmapstress tests

[Subrata Modak]

On Sun, 2009-06-07 at 02:32 +0200, Jiri Palecek wrote: 
> Hello,
> 
> these are two little fixes of the mmapstress test.
> 
>  - the mkstemp() function returns -1 on error; the tests treat 0 as
>    error instead
> 
>  - mkstemp() returns a file descriptor; no need to open the file once
>    more later
> 
> Regards
>     Jiri Palecek
> 
> Signed-off-by: Jiri Palecek <jpalecek@web.de>

Thanks.

Regards--
Subrata

> ---
>  testcases/kernel/mem/mmapstress/mmapstress02.c |    6 +-----
>  testcases/kernel/mem/mmapstress/mmapstress05.c |    6 +-----
>  2 files changed, 2 insertions(+), 10 deletions(-)
> 
> diff --git a/testcases/kernel/mem/mmapstress/mmapstress02.c b/testcases/kernel/mem/mmapstress/mmapstress02.c
> index a0f0693..f801a2e 100644
> --- a/testcases/kernel/mem/mmapstress/mmapstress02.c
> +++ b/testcases/kernel/mem/mmapstress/mmapstress02.c
> @@ -101,7 +101,7 @@ main(int argc, char *argv[]) {
>  		return 1;
>  	}
>  	(void)time(&t);
> -	if (!(fd = mkstemp(tmpname))) {
> +	if ((fd = mkstemp(tmpname)) == -1) {
>  		ERROR("mkstemp failed");
>  		anyfail();
>  	}
> @@ -114,10 +114,6 @@ main(int argc, char *argv[]) {
>          CATCH_SIG(SIGINT);
>          CATCH_SIG(SIGQUIT);
>          CATCH_SIG(SIGTERM);
> -	if ((fd = open(tmpname, O_CREAT|O_RDWR, 0777)) == -1) {
> -		ERROR("couldn't open temporary file");
> -		anyfail();
> -	}
>  	if (sbrk(2*pagesize - ((ulong)sbrk(0) & (pagesize-1))) == (char *)-1) {
>  		CLEANERROR("couldn't round up brk");
>  		anyfail();
> diff --git a/testcases/kernel/mem/mmapstress/mmapstress05.c b/testcases/kernel/mem/mmapstress/mmapstress05.c
> index 9155834..4d25b8d 100644
> --- a/testcases/kernel/mem/mmapstress/mmapstress05.c
> +++ b/testcases/kernel/mem/mmapstress/mmapstress05.c
> @@ -133,7 +133,7 @@ main(int argc, char *argv[])
>  	-- sreeni
>  	*/
> 
> -	if (!(fd = mkstemp(tmpname))) {
> +	if ((fd = mkstemp(tmpname))==-1) {
>  		ERROR("mkstemp failed");
>  		anyfail();
>  	}
> @@ -146,10 +146,6 @@ main(int argc, char *argv[])
>  	CATCH_SIG(SIGINT);
>          CATCH_SIG(SIGQUIT);
>          CATCH_SIG(SIGTERM);
> -	if ((fd = open(tmpname, O_RDWR|O_CREAT, 0777)) == -1) {
> -		ERROR("open failed");
> -		anyfail();
> -	}
>  	for (i = 0; i < pagesize; i++)
>  		buf[i] = 'a';
>  	if (write(fd, buf, pagesize) != pagesize) {


------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list