[Ltp-commits] [Git] ltp updated.

[Cyril H. <su...@li...>]

The branch, master, has been updated
       via  c0e21fd8bb45f537154acd91489b048079dda2f0 (commit)
       via  17ea0a9df5289d0c452442cd899fdaaa283343d8 (commit)
      from  1cd320783ef85daf11f5cbff721edd69cd172522 (commit)


- Log -----------------------------------------------------------------
commit c0e21fd8bb45f537154acd91489b048079dda2f0
Author: Jan Stancek <jst...@re...>
Date:   Wed Apr 17 11:09:48 2013 +0200

    aio01: fix compare loop
    
    For loop was breaking unconditionally after 1st iteration.
    
    Signed-off-by: Jan Stancek <jst...@re...>

commit 17ea0a9df5289d0c452442cd899fdaaa283343d8
Author: Jan Stancek <jst...@re...>
Date:   Wed Apr 17 11:05:33 2013 +0200

    aio01: fix arg types in tst_resm
    
    TEST_RETURN type is long.
    
    Signed-off-by: Jan Stancek <jst...@re...>

-----------------------------------------------------------------------

Summary of changes:
 testcases/kernel/io/aio/aio01/aio01.c |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)
 
diff --git a/testcases/kernel/io/aio/aio01/aio01.c b/testcases/kernel/io/aio/aio01/aio01.c
index d30697d..b82bb7a 100644
--- a/testcases/kernel/io/aio/aio01/aio01.c
+++ b/testcases/kernel/io/aio/aio01/aio01.c
@@ -141,8 +141,8 @@ int main(int argc, char **argv)
 		} while (TEST_RETURN == -EAGAIN);
 		if (TEST_RETURN < 0) {
 			TEST_ERROR_LOG(TEST_ERRNO);
-			tst_resm(TFAIL, "Test 1: io_submit failed - retval=%d, "
-				 "errno=%d", TEST_RETURN, TEST_ERRNO);
+			tst_resm(TFAIL, "Test 1: io_submit failed - retval=%ld"
+				 ", errno=%d", TEST_RETURN, TEST_ERRNO);
 			failflag = 1;
 			continue;
 		}
@@ -173,8 +173,8 @@ int main(int argc, char **argv)
 		} while (TEST_RETURN == -EAGAIN);
 		if (TEST_RETURN < 0) {
 			TEST_ERROR_LOG(TEST_ERRNO);
-			tst_resm(TFAIL, "Test 2: io_submit failed - retval=%d, "
-				 "errno=%d", TEST_RETURN, TEST_ERRNO);
+			tst_resm(TFAIL, "Test 2: io_submit failed - retval=%ld"
+				 ", errno=%d", TEST_RETURN, TEST_ERRNO);
 			failflag = 1;
 			continue;
 		}
@@ -205,8 +205,8 @@ int main(int argc, char **argv)
 		} while (TEST_RETURN == -EAGAIN);
 		if (TEST_RETURN < 0) {
 			TEST_ERROR_LOG(TEST_ERRNO);
-			tst_resm(TFAIL, "Test 3: io_submit failed - retval=%d, "
-				 "errno=%d", TEST_RETURN, TEST_ERRNO);
+			tst_resm(TFAIL, "Test 3: io_submit failed - retval=%ld"
+				 ", errno=%d", TEST_RETURN, TEST_ERRNO);
 			failflag = 1;
 			continue;
 		}
@@ -237,8 +237,8 @@ int main(int argc, char **argv)
 		} while (TEST_RETURN == -EAGAIN);
 		if (TEST_RETURN < 0) {
 			TEST_ERROR_LOG(TEST_ERRNO);
-			tst_resm(TFAIL, "Test 4: io_submit failed - retval=%d, "
-				 "errno=%d", TEST_RETURN, TEST_ERRNO);
+			tst_resm(TFAIL, "Test 4: io_submit failed - retval=%ld"
+				 ", errno=%d", TEST_RETURN, TEST_ERRNO);
 			failflag = 1;
 			continue;
 		}
@@ -270,7 +270,7 @@ int main(int argc, char **argv)
 		if (TEST_RETURN < 0) {
 			TEST_ERROR_LOG(TEST_ERRNO);
 			tst_resm(TFAIL, "Test 5: write io_submit failed - "
-				 "retval=%d, errno=%d", TEST_RETURN,
+				 "retval=%ld, errno=%d", TEST_RETURN,
 				 TEST_ERRNO);
 			failflag = 1;
 			continue;
@@ -285,7 +285,7 @@ int main(int argc, char **argv)
 		if (TEST_RETURN < 0) {
 			TEST_ERROR_LOG(TEST_ERRNO);
 			tst_resm(TFAIL, "Test 5: read io_submit failed - "
-				 "retval=%d, errno=%d", TEST_RETURN,
+				 "retval=%ld, errno=%d", TEST_RETURN,
 				 TEST_ERRNO);
 			failflag = 1;
 			continue;
@@ -318,7 +318,7 @@ int main(int argc, char **argv)
 		if (TEST_RETURN < 0) {
 			TEST_ERROR_LOG(TEST_ERRNO);
 			tst_resm(TFAIL, "Test 6: write io_submit failed - "
-				 "retval=%d, errno=%d", TEST_RETURN,
+				 "retval=%ld, errno=%d", TEST_RETURN,
 				 TEST_ERRNO);
 			failflag = 1;
 			continue;
@@ -333,18 +333,19 @@ int main(int argc, char **argv)
 		if (TEST_RETURN < 0) {
 			TEST_ERROR_LOG(TEST_ERRNO);
 			tst_resm(TFAIL, "Test 6: read io_submit failed - "
-				 "retval=%d, errno=%d", TEST_RETURN,
+				 "retval=%ld, errno=%d", TEST_RETURN,
 				 TEST_ERRNO);
 			failflag = 1;
 			continue;
 		}
 		while (io_getevents(io_ctx, 1, 1, &event, &ts) != 1) ;
 		for (j = 0; j < bufsize; j++) {
-			if (srcbuf[j] != dstbuf[j])
+			if (srcbuf[j] != dstbuf[j]) {
 				tst_resm(TFAIL, "Test 6: compare failed - "
 					 "read: %c, " "actual: %c",
 					 dstbuf[j], srcbuf[j]);
-			break;
+				break;
+			}
 		}
 		gettimeofday(&etv, NULL);
 	}


hooks/post-receive
-- 
ltp