Menu
▾
▴
[Ltp-commits] [Git] ltp updated.
|
From: Cyril H. <su...@li...> - 2013-04-17 14:21:23
|
The branch, master, has been updated
via 768637838d3f05888a49d1f716971443d69fe8e2 (commit)
via 4f2ab1360cae73e2d0816a90962ee6f35e6e6ec5 (commit)
via 6d669cc3350245fb5b14b423a7291a4e7f56ac0f (commit)
via 775d84c8aa7bb34d2c0f65c522d5e24297506ac1 (commit)
via 495581c4f868d738d3d245ae7c8a5520e789e36e (commit)
from cb2967b27a65becc2c7c6fe8ea29a1b832fb5adc (commit)
- Log -----------------------------------------------------------------
commit 768637838d3f05888a49d1f716971443d69fe8e2
Merge: cb2967b 4f2ab13
Author: Cyril Hrubis <ch...@su...>
Date: Wed Apr 17 15:26:56 2013 +0200
Merge ../ltp-dev
commit 4f2ab1360cae73e2d0816a90962ee6f35e6e6ec5
Author: Cyril Hrubis <ch...@su...>
Date: Wed Apr 17 15:25:06 2013 +0200
openposix/.../sched_getscheduler/7-1: Fix.
Return UNTESTED for failed optional behavior.
Signed-off-by: Cyril Hrubis <ch...@su...>
commit 6d669cc3350245fb5b14b423a7291a4e7f56ac0f
Author: Cyril Hrubis <ch...@su...>
Date: Wed Apr 17 15:23:36 2013 +0200
openposix/.../sched_getparam/6-1: Fix.
Return UNTESTED for failed optional behavior.
Signed-off-by: Cyril Hrubis <ch...@su...>
commit 775d84c8aa7bb34d2c0f65c522d5e24297506ac1
Author: Cyril Hrubis <ch...@su...>
Date: Wed Apr 17 15:18:59 2013 +0200
open_posix_testsuite/.../aio_return: Fix.
Return UNTESTED instead of UNRESOLVED when aio_return() didn't failed as
the tested behavior is optional.
Signed-off-by: Cyril Hrubis <ch...@su...>
commit 495581c4f868d738d3d245ae7c8a5520e789e36e
Author: Cyril Hrubis <ch...@su...>
Date: Wed Apr 17 15:07:57 2013 +0200
openposix/.../aio_error/3-1: Fix.
The same as previous, the test tests for optional behavior and returns
UNRESOLVED, which is wrong. Fix it by returning UNTESTED.
Signed-off-by: Cyril Hrubis <ch...@su...>
-----------------------------------------------------------------------
Summary of changes:
.../conformance/interfaces/aio_error/3-1.c | 2 +-
.../conformance/interfaces/aio_return/1-1.c | 10 +++++-----
.../conformance/interfaces/aio_return/2-1.c | 12 ++++++------
.../conformance/interfaces/aio_return/3-1.c | 14 +++++++-------
.../conformance/interfaces/aio_return/3-2.c | 12 ++++++------
.../conformance/interfaces/aio_return/4-1.c | 14 +++++++-------
.../conformance/interfaces/sched_getparam/6-1.c | 2 +-
.../interfaces/sched_getscheduler/7-1.c | 6 +++---
8 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_error/3-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_error/3-1.c
index 5d5dbe8..c88be99 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_error/3-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_error/3-1.c
@@ -70,7 +70,7 @@ int main(void)
if (ret != EINVAL) {
printf(TNAME " return code didn't match expected "
"value (%d != %d).\n", ret, EINVAL);
- return PTS_UNRESOLVED;
+ return PTS_UNTESTED;
}
close(fd);
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/1-1.c
index a76ebd6..b10b346 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/1-1.c
@@ -53,7 +53,7 @@ int main(void)
if (fd == -1) {
printf(TNAME " Error at open(): %s\n", strerror(errno));
- exit(PTS_UNRESOLVED);
+ return PTS_UNRESOLVED;
}
unlink(tmpfname);
@@ -67,7 +67,7 @@ int main(void)
if (aio_write(&aiocb) == -1) {
close(fd);
printf(TNAME " Error at aio_write(): %s\n", strerror(errno));
- exit(PTS_FAIL);
+ return PTS_FAIL;
}
do {
@@ -81,15 +81,15 @@ int main(void)
close(fd);
printf(TNAME " Error at aio_return(): %s\n",
strerror(aio_error(&aiocb)));
- exit(PTS_FAIL);
+ return PTS_FAIL;
} else if (retval != BUF_SIZE) {
close(fd);
printf(TNAME "aio_return didn't return expected size: %d\n",
retval);
- exit(PTS_FAIL);
+ return PTS_FAIL;
}
close(fd);
printf("Test PASSED\n");
- exit(PTS_PASS);
+ return PTS_PASS;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/2-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/2-1.c
index 77d976d..8782dd0 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/2-1.c
@@ -51,7 +51,7 @@ int main(void)
if (fd == -1) {
printf(TNAME " Error at open(): %s\n", strerror(errno));
- exit(PTS_UNRESOLVED);
+ return PTS_UNRESOLVED;
}
unlink(tmpfname);
@@ -66,7 +66,7 @@ int main(void)
close(fd);
printf(TNAME " Error at aio_write(): %s\n",
strerror(aio_error(&aiocb)));
- exit(PTS_FAIL);
+ return PTS_FAIL;
}
do {
@@ -82,7 +82,7 @@ int main(void)
close(fd);
printf(TNAME " aio_return didn't return expected size: "
"%d\n", retval);
- exit(PTS_FAIL);
+ return PTS_FAIL;
}
retval = aio_return(&aiocb);
@@ -91,17 +91,17 @@ int main(void)
close(fd);
printf(TNAME " Second call to aio_return() may "
"return -1; aio_return() returned %d\n", retval);
- exit(PTS_UNRESOLVED);
+ return PTS_UNTESTED;
}
} else {
close(fd);
printf(TNAME " Error at aio_error(): %s\n",
strerror(aio_error(&aiocb)));
- exit(PTS_UNRESOLVED);
+ return PTS_UNRESOLVED;
}
close(fd);
printf("Test PASSED\n");
- exit(PTS_PASS);
+ return PTS_PASS;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/3-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/3-1.c
index bdb1a83..8b2d649 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/3-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/3-1.c
@@ -56,7 +56,7 @@ int main(void)
if (fd == -1) {
printf(TNAME " Error at open(): %s\n", strerror(errno));
- exit(PTS_UNRESOLVED);
+ return PTS_UNRESOLVED;
}
unlink(tmpfname);
@@ -71,7 +71,7 @@ int main(void)
close(fd);
printf(TNAME " Error at aio_write(): %s\n",
strerror(aio_error(&aiocb)));
- exit(PTS_FAIL);
+ return PTS_FAIL;
}
do {
@@ -85,7 +85,7 @@ int main(void)
close(fd);
printf(TNAME " Error at aio_return(): %d, %s\n", retval,
strerror(aio_error(&aiocb)));
- exit(PTS_FAIL);
+ return PTS_FAIL;
}
memset(&aiocb, 0, sizeof(struct aiocb));
@@ -97,7 +97,7 @@ int main(void)
close(fd);
printf(TNAME " Error at aio_write(): %s\n",
strerror(aio_error(&aiocb)));
- exit(PTS_FAIL);
+ return PTS_FAIL;
}
do {
@@ -111,19 +111,19 @@ int main(void)
close(fd);
printf(TNAME " Error at aio_return(): %s\n",
strerror(aio_error(&aiocb)));
- exit(PTS_UNRESOLVED);
+ return PTS_UNRESOLVED;
} else {
if (retval != (BUF_SIZE / 2)) {
close(fd);
printf(TNAME " aio_return() didn't fail as expected: "
"%d, %s\n", retval, strerror(aio_error(&aiocb)));
- exit(PTS_UNRESOLVED);
+ return PTS_UNRESOLVED;
}
}
close(fd);
printf("Test PASSED\n");
- exit(PTS_PASS);
+ return PTS_PASS;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/3-2.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/3-2.c
index 8df6585..d5711a0 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/3-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/3-2.c
@@ -54,7 +54,7 @@ int main(void)
if (fd == -1) {
printf(TNAME " Error at open(): %s\n", strerror(errno));
- exit(PTS_UNRESOLVED);
+ return PTS_UNRESOLVED;
}
unlink(tmpfname);
@@ -69,7 +69,7 @@ int main(void)
close(fd);
printf(TNAME " Error at aio_write(): %s\n",
strerror(aio_error(&aiocb)));
- exit(PTS_FAIL);
+ return PTS_FAIL;
}
do {
@@ -82,14 +82,14 @@ int main(void)
if (retval == -1) {
printf(TNAME " Error at aio_error(): %s\n",
strerror(aio_error(&aiocb)));
- exit(PTS_UNRESOLVED);
+ return PTS_UNRESOLVED;
} else {
if (retval != BUF_SIZE) {
close(fd);
printf(TNAME " Error at aio_return(): %d, %s\n", retval,
strerror(aio_error(&aiocb)));
- exit(PTS_FAIL);
+ return PTS_FAIL;
}
retval = aio_return(&aiocb);
@@ -99,12 +99,12 @@ int main(void)
printf(TNAME " aio_return() may fail with (-1, %d); "
"failed with (%d, %d) instead\n",
EINVAL, retval, aio_error(&aiocb));
- exit(PTS_UNRESOLVED);
+ return PTS_UNTESTED;
}
}
close(fd);
printf("Test PASSED\n");
- exit(PTS_PASS);
+ return PTS_PASS;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/4-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/4-1.c
index 388c985..c4d0e94 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/4-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/4-1.c
@@ -54,7 +54,7 @@ int main(void)
if (fd == -1) {
printf(TNAME " Error at open(): %s\n", strerror(errno));
- exit(PTS_UNRESOLVED);
+ return PTS_UNRESOLVED;
}
unlink(tmpfname);
@@ -68,7 +68,7 @@ int main(void)
if (aio_write(&aiocb) == -1) {
close(fd);
printf(TNAME " Error at aio_write(): %s\n", strerror(errno));
- exit(PTS_FAIL);
+ return PTS_FAIL;
}
do {
@@ -89,8 +89,8 @@ int main(void)
if (retval != -1 || aio_error(&aiocb) != EINVAL) {
close(fd);
- printf(TNAME " aio_return() may fail\n");
- exit(PTS_UNRESOLVED);
+ printf(TNAME "aio_return() have not failed\n");
+ return PTS_UNTESTED;
}
retval = aio_return(&aiocb);
@@ -99,16 +99,16 @@ int main(void)
close(fd);
printf(TNAME " Error at aio_return(): %d, %s\n", retval,
strerror(aio_error(&aiocb)));
- exit(PTS_UNRESOLVED);
+ return PTS_UNRESOLVED;
}
} else {
close(fd);
printf(TNAME " Error at aio_error(): %s\n", strerror(retval));
- exit(PTS_UNRESOLVED);
+ return PTS_UNRESOLVED;
}
close(fd);
printf("Test PASSED\n");
- exit(PTS_PASS);
+ return PTS_PASS;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/6-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/6-1.c
index c27695d..2c9c5d5 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/6-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/6-1.c
@@ -94,7 +94,7 @@ int main(void)
}
if (result == 0) {
printf("The function sched_getparam has successed.\n");
- return PTS_UNRESOLVED;
+ return PTS_UNTESTED;
}
if (errno != EPERM) {
perror("errno is not EPERM: The system allows a non-root"
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/7-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/7-1.c
index 04a43b3..d0be68d 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/7-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/7-1.c
@@ -21,8 +21,8 @@
#include <string.h>
#include "posixtest.h"
-/** Set the euid of this process to a non-root uid */
-int set_nonroot()
+/* Set the euid of this process to a non-root uid */
+int set_nonroot(void)
{
struct passwd *pw;
setpwent();
@@ -74,7 +74,7 @@ int main(void)
}
if (result == 0) {
printf("The function sched_getscheduler has successed.\n");
- return PTS_UNRESOLVED;
+ return PTS_UNTESTED;
}
if (errno != EPERM) {
perror("errno is not EPERM");
hooks/post-receive
--
ltp
|
