[LTP] [PATCH]fix bug of tst_brk

[LTP] [PATCH]fix bug of tst_brk

[Bian Naimeng]

Test will fail if invoke tst_brk with (TCONF | TERRNO), it's not our expectation.

Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>

---
 lib/tst_res.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/tst_res.c b/lib/tst_res.c
index 2debd44..193653f 100644
--- a/lib/tst_res.c
+++ b/lib/tst_res.c
@@ -616,21 +616,21 @@ void tst_brk(int ttype, char *fname, void (*func)(void), char *arg_fmt, ...)
 		sprintf(Warn_mesg, "tst_brk(): Invalid Type: %d.  Using TBROK",
 			ttype_result);
 		tst_print(TCID, 0, TWARN, Warn_mesg);
-		ttype = TBROK;
+		ttype = (ttype & ~ttype_result) | TBROK;
 	}
 
 	/* Print the first result, if necessary. */
 	if (Tst_count < TST_TOTAL)
 		tst_res(ttype, fname, "%s", tmesg);
 
-	if (ttype == TCONF) {
+	if (ttype_result == TCONF) {
 		tst_res(ttype, NULL,
 			"Remaining cases not appropriate for configuration");
 	} else {
-		if (ttype == TRETR)
+		if (ttype_result == TRETR)
 			tst_res(ttype, NULL, "Remaining cases retired");
 		else
-			tst_res(TBROK, NULL, "Remaining cases broken");
+			tst_res(ttype, NULL, "Remaining cases broken");
 	}
 	Expand_varargs = TRUE;
 
-- 
1.7.0.4




-- 
Regards
Bian Naimeng


------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and, 
should the need arise, upgrade to a full multi-node Oracle RAC database 
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH]fix bug of tst_brk

[Garrett Cooper]

On Dec 27, 2010, at 10:42 PM, Bian Naimeng wrote:

> Test will fail if invoke tst_brk with (TCONF | TERRNO), it's not our expectation.
> 
> Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>

Good catch -- thanks!
-Garrett
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and, 
should the need arise, upgrade to a full multi-node Oracle RAC database 
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list