Menu
▾
▴
[Ltp-commits] [Git] ltp updated.
|
From: Cyril H. <su...@li...> - 2013-10-14 15:51:16
|
The branch, master, has been updated
via 9ca9633cb75c407a81b98673891982b2e0702b29 (commit)
from 6f3147f01229f3bb953202cde828d35e0d2bcb8a (commit)
- Log -----------------------------------------------------------------
commit 9ca9633cb75c407a81b98673891982b2e0702b29
Author: Cyril Hrubis <ch...@su...>
Date: Mon Oct 14 17:06:47 2013 +0200
openposix: Remove unreachable code.
Change all occurences of:
int main(void)
{
...
if (failed) {
printf("Test FAILED\n");
return PTS_FAIL;
} else {
printf("Test PASSED\n");
return PTS_PASS;
}
printf("This code should not be executed\n");
return PTS_UNRESOLVED;
}
And similar for:
int main(void)
{
...
if (failed) {
printf("Test FAILED\n");
return PTS_FAIL;
}
printf("Test PASSED\n");
return PTS_PASS;
}
To remove unreachable code.
Signed-off-by: Cyril Hrubis <ch...@su...>
-----------------------------------------------------------------------
Summary of changes:
.../conformance/interfaces/clock_getres/5-1.c | 7 ++-----
.../conformance/interfaces/clock_getres/6-2.c | 7 ++-----
.../conformance/interfaces/clock_gettime/1-1.c | 7 ++-----
.../conformance/interfaces/clock_gettime/1-2.c | 5 +----
.../conformance/interfaces/clock_gettime/2-1.c | 5 +----
.../conformance/interfaces/clock_gettime/3-1.c | 10 +++-------
.../conformance/interfaces/clock_gettime/4-1.c | 10 +++-------
.../conformance/interfaces/clock_gettime/7-1.c | 7 ++-----
.../conformance/interfaces/clock_gettime/8-1.c | 5 +----
.../conformance/interfaces/clock_gettime/8-2.c | 7 ++-----
.../conformance/interfaces/clock_nanosleep/1-1.c | 7 ++-----
.../conformance/interfaces/clock_nanosleep/13-1.c | 7 ++-----
.../conformance/interfaces/clock_nanosleep/2-1.c | 7 ++-----
.../conformance/interfaces/clock_nanosleep/3-1.c | 7 ++-----
.../conformance/interfaces/clock_settime/1-1.c | 6 +-----
.../conformance/interfaces/clock_settime/17-1.c | 5 +----
.../conformance/interfaces/clock_settime/17-2.c | 7 ++-----
.../conformance/interfaces/clock_settime/4-1.c | 11 ++++-------
.../conformance/interfaces/clock_settime/5-2.c | 11 ++++-------
.../conformance/interfaces/nanosleep/1-1.c | 7 ++-----
.../conformance/interfaces/nanosleep/2-1.c | 8 +++-----
.../conformance/interfaces/nanosleep/5-1.c | 7 ++-----
.../interfaces/sched_get_priority_max/1-1.c | 7 ++-----
.../interfaces/sched_get_priority_max/1-2.c | 7 ++-----
.../interfaces/sched_get_priority_max/1-3.c | 7 ++-----
.../interfaces/sched_get_priority_max/1-4.c | 7 ++-----
.../interfaces/sched_get_priority_max/2-1.c | 5 +----
.../interfaces/sched_get_priority_min/1-1.c | 7 ++-----
.../interfaces/sched_get_priority_min/1-2.c | 7 ++-----
.../interfaces/sched_get_priority_min/1-3.c | 7 ++-----
.../interfaces/sched_get_priority_min/1-4.c | 7 ++-----
.../interfaces/sched_get_priority_min/2-1.c | 5 +----
.../conformance/interfaces/sched_getparam/1-1.c | 12 +++++++++---
.../conformance/interfaces/sched_getparam/2-1.c | 9 +++------
.../conformance/interfaces/sched_getparam/3-1.c | 6 +-----
.../interfaces/sched_getscheduler/1-1.c | 11 +++++------
.../conformance/interfaces/sem_post/4-1.c | 8 +++-----
.../conformance/interfaces/timer_create/1-1.c | 11 ++++-------
.../conformance/interfaces/timer_delete/1-2.c | 7 ++-----
.../conformance/interfaces/timer_getoverrun/1-1.c | 9 +++------
.../conformance/interfaces/timer_getoverrun/2-1.c | 9 +++------
.../conformance/interfaces/timer_getoverrun/2-3.c | 9 +++------
.../conformance/interfaces/timer_gettime/1-1.c | 11 ++++-------
.../conformance/interfaces/timer_gettime/1-2.c | 11 ++++-------
.../conformance/interfaces/timer_gettime/1-4.c | 11 ++++-------
.../conformance/interfaces/timer_gettime/2-2.c | 11 ++++-------
.../conformance/interfaces/timer_gettime/3-1.c | 11 ++++-------
.../conformance/interfaces/timer_settime/1-1.c | 11 ++++-------
.../conformance/interfaces/timer_settime/1-2.c | 7 ++-----
.../conformance/interfaces/timer_settime/13-1.c | 7 ++-----
.../conformance/interfaces/timer_settime/5-1.c | 11 ++++-------
.../conformance/interfaces/timer_settime/8-1.c | 15 ++++++---------
.../conformance/interfaces/timer_settime/8-2.c | 17 +++++++----------
.../conformance/interfaces/timer_settime/8-3.c | 9 +++------
.../conformance/interfaces/timer_settime/8-4.c | 9 +++------
55 files changed, 151 insertions(+), 307 deletions(-)
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/clock_getres/5-1.c b/testcases/open_posix_testsuite/conformance/interfaces/clock_getres/5-1.c
index 7547f33..a7c48d8 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/clock_getres/5-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/clock_getres/5-1.c
@@ -20,11 +20,8 @@ int main(void)
if (clock_getres(INVALIDCLOCKID, &res) == -1) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("Test FAILED\n");
- return PTS_FAIL;
}
- printf("This code should not be executed\n");
- return PTS_UNRESOLVED;
+ printf("Test FAILED\n");
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/clock_getres/6-2.c b/testcases/open_posix_testsuite/conformance/interfaces/clock_getres/6-2.c
index 11a2033..c448090 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/clock_getres/6-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/clock_getres/6-2.c
@@ -54,11 +54,8 @@ int main(void)
if (failure) {
printf("At least one test FAILED -- see above\n");
return PTS_FAIL;
- } else {
- printf("All tests PASSED\n");
- return PTS_PASS;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("All tests PASSED\n");
+ return PTS_PASS;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/1-1.c
index 5ab834f..4e8dd84 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/1-1.c
@@ -27,11 +27,8 @@ int main(void)
printf("clock_gettime() success, but tp not filled\n");
return PTS_FAIL;
}
- } else {
- printf("clock_gettime() failed\n");
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("clock_gettime() failed\n");
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/1-2.c b/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/1-2.c
index e8838a4..b5b698f 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/1-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/1-2.c
@@ -43,11 +43,8 @@ int main(void)
perror("Error calling gettimeofday()\n");
return PTS_UNRESOLVED;
}
- } else {
- printf("clock_gettime() failed\n");
- return PTS_UNRESOLVED;
}
- printf("This code should not be executed.\n");
+ printf("clock_gettime() failed\n");
return PTS_UNRESOLVED;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/2-1.c b/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/2-1.c
index 1b056a2..128169c 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/2-1.c
@@ -43,11 +43,8 @@ int main(void)
perror("Error calling gettimeofday()\n");
return PTS_UNRESOLVED;
}
- } else {
- printf("clock_gettime() failed\n");
- return PTS_UNRESOLVED;
}
- printf("This code should not be executed.\n");
+ printf("clock_gettime() failed\n");
return PTS_UNRESOLVED;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/3-1.c b/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/3-1.c
index 5a82935..910224e 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/3-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/3-1.c
@@ -55,17 +55,13 @@ int main(void)
(ts2.tv_sec <= ts3.tv_sec) && (ts3.tv_sec <= ts4.tv_sec)) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("Test FAILED - ts1=%ld,ts2=%ld,ts3=%ld,ts4=%ld\n",
- ts1.tv_sec, ts2.tv_sec, ts3.tv_sec, ts4.tv_sec);
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("Test FAILED - ts1=%ld,ts2=%ld,ts3=%ld,ts4=%ld\n",
+ ts1.tv_sec, ts2.tv_sec, ts3.tv_sec, ts4.tv_sec);
+ return PTS_FAIL;
#else
printf("CLOCK_MONOTONIC unsupported\n");
return PTS_UNSUPPORTED;
#endif
-
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/4-1.c b/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/4-1.c
index f65a867..0830ee1 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/4-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/4-1.c
@@ -71,18 +71,14 @@ int main(void)
(ts2.tv_sec <= ts3.tv_sec) && (ts3.tv_sec <= ts4.tv_sec)) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("Test FAILED - ts1=%ld,ts2=%ld,ts3=%ld,ts4=%ld\n",
- ts1.tv_sec, ts2.tv_sec, ts3.tv_sec, ts4.tv_sec);
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("Test FAILED - ts1=%ld,ts2=%ld,ts3=%ld,ts4=%ld\n",
+ ts1.tv_sec, ts2.tv_sec, ts3.tv_sec, ts4.tv_sec);
+ return PTS_FAIL;
#else
printf("CLOCK_PROCESS_CPUTIME_ID unsupported\n");
return PTS_UNSUPPORTED;
#endif
#endif
-
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/7-1.c b/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/7-1.c
index 8fbb867..5968b38 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/7-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/7-1.c
@@ -19,11 +19,8 @@ int main(void)
if (clock_gettime(INVALIDCLOCK, &tp) == -1) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("Test FAILED\n");
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("Test FAILED\n");
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/8-1.c b/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/8-1.c
index c3d4520..eea8e9b 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/8-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/8-1.c
@@ -27,11 +27,8 @@ int main(void)
printf("Test FAILED\n");
return PTS_FAIL;
}
- } else {
- printf("clock_gettime() did not return failure\n");
- return PTS_UNRESOLVED;
}
- printf("This code should not be executed.\n");
+ printf("clock_gettime() did not return failure\n");
return PTS_UNRESOLVED;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/8-2.c b/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/8-2.c
index 1385916..ed4cd40 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/8-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/clock_gettime/8-2.c
@@ -52,11 +52,8 @@ int main(void)
if (failure) {
printf("At least one test FAILED -- see above\n");
return PTS_FAIL;
- } else {
- printf("Test PASSED\n");
- return PTS_PASS;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("Test PASSED\n");
+ return PTS_PASS;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/clock_nanosleep/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/clock_nanosleep/1-1.c
index 2b2bc78..7647003 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/clock_nanosleep/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/clock_nanosleep/1-1.c
@@ -50,11 +50,8 @@ int main(void)
if ((slepts > 0) || (sleptns > SLEEPNSEC)) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("clock_nanosleep() did not sleep long enough\n");
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("clock_nanosleep() did not sleep long enough\n");
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/clock_nanosleep/13-1.c b/testcases/open_posix_testsuite/conformance/interfaces/clock_nanosleep/13-1.c
index 038f00a..8cf13eb 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/clock_nanosleep/13-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/clock_nanosleep/13-1.c
@@ -27,11 +27,8 @@ int main(void)
if (clock_nanosleep(BOGUSCLOCKID, 0, &tssleep, NULL) == EINVAL) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("errno != EINVAL\n");
- return PTS_FAIL;
}
- printf("This code should not be executed\n");
- return PTS_UNRESOLVED;
+ printf("errno != EINVAL\n");
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/clock_nanosleep/2-1.c b/testcases/open_posix_testsuite/conformance/interfaces/clock_nanosleep/2-1.c
index a875e17..5419aef 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/clock_nanosleep/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/clock_nanosleep/2-1.c
@@ -54,11 +54,8 @@ int main(void)
printf("clock_nanosleep() slept too long\n");
return PTS_FAIL;
}
- } else {
- printf("clock_nanosleep() did not sleep long enough\n");
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("clock_nanosleep() did not sleep long enough\n");
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/clock_nanosleep/3-1.c b/testcases/open_posix_testsuite/conformance/interfaces/clock_nanosleep/3-1.c
index 18e7a54..287d85d 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/clock_nanosleep/3-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/clock_nanosleep/3-1.c
@@ -55,11 +55,8 @@ int main(void)
printf("FAIL: clock_nanosleep() slept\n");
return PTS_FAIL;
}
- } else {
- printf("FAIL: error in clock_gettime()\n");
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("FAIL: error in clock_gettime()\n");
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/1-1.c
index 74cfc0a..a39e2a6 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/1-1.c
@@ -67,13 +67,9 @@ int main(void)
setBackTime(tpreset);
return PTS_FAIL;
}
- } else {
- printf("clock_settime() failed\n");
- setBackTime(tpreset);
- return PTS_UNRESOLVED;
}
- printf("This code should not be executed.\n");
+ printf("clock_settime() failed\n");
setBackTime(tpreset);
return PTS_UNRESOLVED;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/17-1.c b/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/17-1.c
index 90b0162..af3a587 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/17-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/17-1.c
@@ -39,11 +39,8 @@ int main(void)
printf("errno != EINVAL\n");
return PTS_FAIL;
}
- } else {
- printf("clock_settime() did not return -1\n");
- return PTS_UNRESOLVED;
}
- printf("This test should not be executed.\n");
+ printf("clock_settime() did not return -1\n");
return PTS_UNRESOLVED;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/17-2.c b/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/17-2.c
index 72e34dd..990e414 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/17-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/17-2.c
@@ -66,11 +66,8 @@ int main(void)
if (failure) {
printf("At least one test FAILED -- see above\n");
return PTS_FAIL;
- } else {
- printf("All tests PASSED\n");
- return PTS_PASS;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("All tests PASSED\n");
+ return PTS_PASS;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/4-1.c b/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/4-1.c
index 4cb6bc0..f8a3e9c 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/4-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/4-1.c
@@ -12,7 +12,7 @@
* - get time T0
* - create/enable a timer to expire at T1 = T0 + TIMEROFFSET
* - sleep SLEEPTIME seconds (SLEEPTIME should be < TIMEROFFSET,
- * but > ACCEPTABLEDELTA)
+ * but > ACCEPTABLEDELTA)
* - set time back to T0
* - wait for the timer to expire
* - get time T2
@@ -124,12 +124,9 @@ int main(void)
if ((delta <= ACCEPTABLEDELTA) && (delta >= 0)) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("FAIL: Ended %d, not %d\n",
- (int)tpT2.tv_sec, (int)its.it_value.tv_sec);
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("FAIL: Ended %d, not %d\n",
+ (int)tpT2.tv_sec, (int)its.it_value.tv_sec);
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/5-2.c b/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/5-2.c
index 27cd54e..90badb8 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/5-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/clock_settime/5-2.c
@@ -122,13 +122,10 @@ int main(void)
tsreset.tv_sec += TIMERSEC;
setBackTime(tsreset);
return PTS_PASS;
- } else {
- printf("Timer did not last for correct amount of time\n");
- printf("timer: %d != correct %d\n",
- (int)ts.tv_sec - (int)tsleft.tv_sec, TIMERSEC);
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("Timer did not last for correct amount of time\n");
+ printf("timer: %d != correct %d\n",
+ (int)ts.tv_sec - (int)tsleft.tv_sec, TIMERSEC);
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/nanosleep/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/nanosleep/1-1.c
index 96303ba..687d01e 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/nanosleep/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/nanosleep/1-1.c
@@ -48,11 +48,8 @@ int main(void)
if ((slepts > 0) || (sleptns > sleepnsec)) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("nanosleep() did not sleep long enough\n");
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("nanosleep() did not sleep long enough\n");
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/nanosleep/2-1.c b/testcases/open_posix_testsuite/conformance/interfaces/nanosleep/2-1.c
index 45a509e..cce3941 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/nanosleep/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/nanosleep/2-1.c
@@ -66,10 +66,8 @@ int main(void)
if (failure) {
printf("At least one test FAILED\n");
return PTS_FAIL;
- } else {
- printf("All tests PASSED\n");
- return PTS_PASS;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+
+ printf("All tests PASSED\n");
+ return PTS_PASS;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/nanosleep/5-1.c b/testcases/open_posix_testsuite/conformance/interfaces/nanosleep/5-1.c
index c97691a..f26e7f5 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/nanosleep/5-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/nanosleep/5-1.c
@@ -22,11 +22,8 @@ int main(void)
if (nanosleep(&tssleepfor, &tsstorage) == -1) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("nanosleep() did not return -1 on failure\n");
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("nanosleep() did not return -1 on failure\n");
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/1-1.c
index 03d28a4..1115bf5 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/1-1.c
@@ -27,11 +27,8 @@ int main(void)
result);
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- perror("An error occurs");
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ perror("An error occurs");
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/1-2.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/1-2.c
index 640198a..446a0d0 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/1-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/1-2.c
@@ -27,11 +27,8 @@ int main(void)
result);
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- perror("An error occurs");
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ perror("An error occurs");
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/1-3.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/1-3.c
index df43d3e..092c47b 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/1-3.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/1-3.c
@@ -31,13 +31,10 @@ int main(void)
result);
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- perror("An error occurs");
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ perror("An error occurs");
+ return PTS_FAIL;
}
#else
int main(void)
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/1-4.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/1-4.c
index d1b28a2..25efb95 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/1-4.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/1-4.c
@@ -27,11 +27,8 @@ int main(void)
result);
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- perror("An error occurs");
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ perror("An error occurs");
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/2-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/2-1.c
index 584a39d..fee605d 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_max/2-1.c
@@ -34,11 +34,8 @@ int main(void)
if (errno != EINVAL) {
perror("error is not EINVAL");
return PTS_FAIL;
- } else {
- printf("Unresolved test error\n");
- return PTS_UNRESOLVED;
}
- printf("This code should not be executed.\n");
+ printf("Unresolved test error\n");
return PTS_UNRESOLVED;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-1.c
index 9f4841d..94d8dd9 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-1.c
@@ -27,11 +27,8 @@ int main(void)
result);
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- perror("An error occurs");
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ perror("An error occurs");
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-2.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-2.c
index e9a1636..775ec73 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-2.c
@@ -27,11 +27,8 @@ int main(void)
result);
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- perror("An error occurs");
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ perror("An error occurs");
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-3.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-3.c
index 184ee7f..405c3f3 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-3.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-3.c
@@ -31,13 +31,10 @@ int main(void)
result);
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- perror("An error occurs");
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ perror("An error occurs");
+ return PTS_FAIL;
}
#else
int main(void)
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-4.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-4.c
index b8e7f99..1bfd17e 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-4.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/1-4.c
@@ -27,11 +27,8 @@ int main(void)
result);
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- perror("An error occurs");
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ perror("An error occurs");
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/2-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/2-1.c
index 40cb00d..54a6ab1 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_get_priority_min/2-1.c
@@ -34,11 +34,8 @@ int main(void)
if (errno != EINVAL) {
perror("error is not EINVAL");
return PTS_FAIL;
- } else {
- printf("Unresolved test error\n");
- return PTS_UNRESOLVED;
}
- printf("This code should not be executed.\n");
+ printf("Unresolved test error\n");
return PTS_UNRESOLVED;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/1-1.c
index df2963a..3bbcef8 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/1-1.c
@@ -29,13 +29,19 @@ int main(void)
if (result == 0 && param.sched_priority != -1 && errno == 0) {
printf("Test PASSED\n");
return PTS_PASS;
- } else if (result != 0) {
+ }
+
+ if (result != 0) {
printf("Return code is not zero.\n");
return PTS_FAIL;
- } else if (errno != 0) {
+ }
+
+ if (errno != 0) {
perror("Unexpected error");
return PTS_FAIL;
- } else if (param.sched_priority == -1) {
+ }
+
+ if (param.sched_priority == -1) {
printf("The 'sched_priority' member does not change.\n");
return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/2-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/2-1.c
index c419103..d7658e1 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/2-1.c
@@ -35,12 +35,9 @@ int main(void)
param0.sched_priority == param1.sched_priority && errno == 0) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("Different results between pid == 0 "
- "and pid == getpid().\n");
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("Different results between pid == 0 "
+ "and pid == getpid().\n");
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/3-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/3-1.c
index 6e89b0d..378cada 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/3-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_getparam/3-1.c
@@ -17,7 +17,6 @@
int main(void)
{
-
struct sched_param param;
int result = -1;
@@ -38,11 +37,8 @@ int main(void)
if (result != 0) {
printf("returned code is not zero.\n");
return PTS_FAIL;
- } else {
- perror("Unresolved test error");
- return PTS_UNRESOLVED;
}
- printf("This code should not be executed.\n");
+ perror("Unresolved test error");
return PTS_UNRESOLVED;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/1-1.c
index d764ffb..7eebaff 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sched_getscheduler/1-1.c
@@ -29,15 +29,14 @@ int main(void)
if (result0 == result1 && errno == 0) {
printf("Test PASSED\n");
return PTS_PASS;
- } else if (result0 != result1) {
+ }
+
+ if (result0 != result1) {
printf("Different results between pid == 0 "
"and pid == getpid().\n");
return PTS_FAIL;
- } else {
- perror("Unexpected error");
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ perror("Unexpected error");
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_post/4-1.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_post/4-1.c
index c1902d3..bf18d1b 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/sem_post/4-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/sem_post/4-1.c
@@ -41,10 +41,8 @@ int main(void)
sem_close(mysemp);
sem_unlink(semname);
return PTS_PASS;
- } else {
- puts("TEST FAILED: value of sem_post is not returning zero");
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+
+ puts("TEST FAILED: value of sem_post is not returning zero");
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_create/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/timer_create/1-1.c
index 57f8eb2..0a7db51 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_create/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_create/1-1.c
@@ -88,13 +88,10 @@ int main(void)
if (abs(tsleft.tv_sec - SLEEPDELTA) <= ACCEPTABLEDELTA) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("Timer did not last for correct amount of time\n");
- printf("timer: %d != correct %d\n",
- (int)ts.tv_sec - (int)tsleft.tv_sec, TIMERSEC);
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("Timer did not last for correct amount of time\n");
+ printf("timer: %d != correct %d\n",
+ (int)ts.tv_sec - (int)tsleft.tv_sec, TIMERSEC);
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_delete/1-2.c b/testcases/open_posix_testsuite/conformance/interfaces/timer_delete/1-2.c
index 769bfc0..43a7c14 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_delete/1-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_delete/1-2.c
@@ -58,11 +58,8 @@ int main(void)
printf("errno!=EINVAL after a timer_delete()\n");
return PTS_FAIL;
}
- } else {
- printf("timer_settime() did not fail after timer_delete()\n");
- return PTS_FAIL;
}
- printf("This code should not be executed\n");
- return PTS_UNRESOLVED;
+ printf("timer_settime() did not fail after timer_delete()\n");
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_getoverrun/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/timer_getoverrun/1-1.c
index c9656de..624d48b 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_getoverrun/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_getoverrun/1-1.c
@@ -109,14 +109,11 @@ int main(void)
overruns = timer_getoverrun(tid);
printf("Total overruns: %d\n", overruns);
- if (1 == madeit) {
+ if (madeit == 1) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("FAIL: %d signals sent\n", madeit);
- return PTS_FAIL;
}
- printf("UNRESOLVED: This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("FAIL: %d signals sent\n", madeit);
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_getoverrun/2-1.c b/testcases/open_posix_testsuite/conformance/interfaces/timer_getoverrun/2-1.c
index 43e88bf..88e152a 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_getoverrun/2-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_getoverrun/2-1.c
@@ -83,12 +83,9 @@ int main(void)
if (EXPECTEDOVERRUNS == overruns) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("FAIL: %d overruns sent; expected %d\n",
- overruns, EXPECTEDOVERRUNS);
- return PTS_FAIL;
}
- printf("UNRESOLVED: This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("FAIL: %d overruns sent; expected %d\n",
+ overruns, EXPECTEDOVERRUNS);
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_getoverrun/2-3.c b/testcases/open_posix_testsuite/conformance/interfaces/timer_getoverrun/2-3.c
index 0528d4d..96b7d01 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_getoverrun/2-3.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_getoverrun/2-3.c
@@ -150,12 +150,9 @@ int main(void)
if (overruns >= expectedoverruns && overruns < expectedoverruns + fudge) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("FAIL: %d overruns sent; expected %d\n",
- overruns, expectedoverruns);
- return PTS_FAIL;
}
- printf("UNRESOLVED: This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("FAIL: %d overruns sent; expected %d\n",
+ overruns, expectedoverruns);
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/1-1.c
index 38728fb..e2f66e5 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/1-1.c
@@ -69,13 +69,10 @@ int main(void)
if (delta <= ACCEPTABLEDELTA) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("FAIL: timer_gettime() value !~= timer_settime()\n");
- printf("%d !~= %d\n", (int)itsget.it_value.tv_sec,
- (int)itsset.it_value.tv_sec);
- return PTS_FAIL;
}
- printf("This code should not be executed\n");
- return PTS_UNRESOLVED;
+ printf("FAIL: timer_gettime() value !~= timer_settime()\n");
+ printf("%d !~= %d\n", (int)itsget.it_value.tv_sec,
+ (int)itsset.it_value.tv_sec);
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/1-2.c b/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/1-2.c
index a499232..0c39a6e 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/1-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/1-2.c
@@ -76,13 +76,10 @@ int main(void)
if (delta <= ACCEPTABLEDELTA) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("FAIL: timer_gettime() value !~= time expected left\n");
- printf("%d !~= %d\n", (int)itsget.it_value.tv_sec,
- (int)itsset.it_value.tv_sec - SLEEPSEC);
- return PTS_FAIL;
}
- printf("This code should not be executed\n");
- return PTS_UNRESOLVED;
+ printf("FAIL: timer_gettime() value !~= time expected left\n");
+ printf("%d !~= %d\n", (int)itsget.it_value.tv_sec,
+ (int)itsset.it_value.tv_sec - SLEEPSEC);
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/1-4.c b/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/1-4.c
index 5ee9f40..1c6a363 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/1-4.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/1-4.c
@@ -103,13 +103,10 @@ int main(void)
if (delta <= ACCEPTABLEDELTA) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("FAIL: timer_gettime() value !~= time expected left\n");
- printf("%d !~= %d\n", (int)itsget.it_value.tv_sec,
- (int)itsset.it_value.tv_sec - SLEEPSEC);
- return PTS_FAIL;
}
- printf("This code should not be executed\n");
- return PTS_UNRESOLVED;
+ printf("FAIL: timer_gettime() value !~= time expected left\n");
+ printf("%d !~= %d\n", (int)itsget.it_value.tv_sec,
+ (int)itsset.it_value.tv_sec - SLEEPSEC);
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/2-2.c b/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/2-2.c
index f4148e0..e5c10c0 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/2-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/2-2.c
@@ -63,13 +63,10 @@ int main(void)
if (0 == itsget.it_value.tv_sec && 0 == itsget.it_value.tv_nsec) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("Test FAILED: tv_sec %d tv_nsec %d\n",
- (int)itsget.it_value.tv_sec,
- (int)itsget.it_value.tv_nsec);
- return PTS_FAIL;
}
- printf("This code should not be executed\n");
- return PTS_UNRESOLVED;
+ printf("Test FAILED: tv_sec %d tv_nsec %d\n",
+ (int)itsget.it_value.tv_sec,
+ (int)itsget.it_value.tv_nsec);
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/3-1.c b/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/3-1.c
index 18e8a77..9777256 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/3-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_gettime/3-1.c
@@ -78,13 +78,10 @@ int main(void)
if (delta <= ACCEPTABLEDELTA) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("FAIL: timer_gettime() value !~= timer_settime()\n");
- printf("%d !~= %d\n", (int)itsget.it_value.tv_sec,
- (int)itsset.it_value.tv_sec);
- return PTS_FAIL;
}
- printf("This code should not be executed\n");
- return PTS_UNRESOLVED;
+ printf("FAIL: timer_gettime() value !~= timer_settime()\n");
+ printf("%d !~= %d\n", (int)itsget.it_value.tv_sec,
+ (int)itsset.it_value.tv_sec);
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/1-1.c
index fc1e644..c8e0a04 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/1-1.c
@@ -90,13 +90,10 @@ int main(void)
if (abs(tsleft.tv_sec - SLEEPDELTA) <= ACCEPTABLEDELTA) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("Timer did not last for correct amount of time\n");
- printf("timer: %d != correct %d\n",
- (int)ts.tv_sec - (int)tsleft.tv_sec, TIMERSEC);
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("Timer did not last for correct amount of time\n");
+ printf("timer: %d != correct %d\n",
+ (int)ts.tv_sec - (int)tsleft.tv_sec, TIMERSEC);
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/1-2.c b/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/1-2.c
index 24c02eb..9ba0612 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/1-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/1-2.c
@@ -105,11 +105,8 @@ int main(void)
if (failure) {
printf("At least one test FAILED\n");
return PTS_FAIL;
- } else {
- printf("All tests PASSED\n");
- return PTS_PASS;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("All tests PASSED\n");
+ return PTS_PASS;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/13-1.c b/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/13-1.c
index 3596305..31cd56f 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/13-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/13-1.c
@@ -98,11 +98,8 @@ int main(void)
if (failure) {
printf("At least one test FAILED\n");
return PTS_FAIL;
- } else {
- printf("All tests PASSED\n");
- return PTS_PASS;
}
- printf("This code could not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("All tests PASSED\n");
+ return PTS_PASS;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/5-1.c b/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/5-1.c
index 03ea922..1151ed4 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/5-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/5-1.c
@@ -92,13 +92,10 @@ int main(void)
if (abs(tsleft.tv_sec - SLEEPDELTA) <= ACCEPTABLEDELTA) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("Timer did not last for correct amount of time\n");
- printf("timer: %d != correct %d\n",
- (int)ts.tv_sec - (int)tsleft.tv_sec, TIMERSEC);
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("Timer did not last for correct amount of time\n");
+ printf("timer: %d != correct %d\n",
+ (int)ts.tv_sec - (int)tsleft.tv_sec, TIMERSEC);
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/8-1.c b/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/8-1.c
index 0add2d2..e8ce8c2 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/8-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/8-1.c
@@ -51,15 +51,12 @@ int main(void)
(0 == oits.it_interval.tv_sec) && (0 == oits.it_interval.tv_nsec)) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("Test FAILED: value: tv_sec %d tv_nsec %d\n",
- (int)oits.it_value.tv_sec, (int)oits.it_value.tv_nsec);
- printf("Test FAILED: interval: tv_sec %d tv_nsec %d\n",
- (int)oits.it_interval.tv_sec,
- (int)oits.it_interval.tv_nsec);
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("Test FAILED: value: tv_sec %d tv_nsec %d\n",
+ (int)oits.it_value.tv_sec, (int)oits.it_value.tv_nsec);
+ printf("Test FAILED: interval: tv_sec %d tv_nsec %d\n",
+ (int)oits.it_interval.tv_sec,
+ (int)oits.it_interval.tv_nsec);
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/8-2.c b/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/8-2.c
index b66ea21..0493de2 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/8-2.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/8-2.c
@@ -74,16 +74,13 @@ int main(void)
(0 == oits.it_interval.tv_sec) && (0 == oits.it_interval.tv_nsec)) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("Test FAILED: value: tv_sec %d tv_nsec %d\n",
- (int)oits.it_value.tv_sec, (int)oits.it_value.tv_nsec);
-
- printf("Test FAILED: interval: tv_sec %d tv_nsec %d\n",
- (int)oits.it_interval.tv_sec,
- (int)oits.it_interval.tv_nsec);
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("Test FAILED: value: tv_sec %d tv_nsec %d\n",
+ (int)oits.it_value.tv_sec, (int)oits.it_value.tv_nsec);
+
+ printf("Test FAILED: interval: tv_sec %d tv_nsec %d\n",
+ (int)oits.it_interval.tv_sec,
+ (int)oits.it_interval.tv_nsec);
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/8-3.c b/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/8-3.c
index c34938f..f512404 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/8-3.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/8-3.c
@@ -62,12 +62,9 @@ int main(void)
if (abs(oits.it_value.tv_sec - TIMELEFT) <= ACCEPTABLEDELTA) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("Test FAILED: time left %d oits.it_value.tv_sec %d\n",
- TIMELEFT, (int)oits.it_value.tv_sec);
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("Test FAILED: time left %d oits.it_value.tv_sec %d\n",
+ TIMELEFT, (int)oits.it_value.tv_sec);
+ return PTS_FAIL;
}
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/8-4.c b/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/8-4.c
index ad4ecbf..cdf4612 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/8-4.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/8-4.c
@@ -60,12 +60,9 @@ int main(void)
if (RELOADVAL == oits.it_interval.tv_sec) {
printf("Test PASSED\n");
return PTS_PASS;
- } else {
- printf("Test FAILED: correct %d oits.it_interval %d\n",
- RELOADVAL, (int)oits.it_interval.tv_sec);
- return PTS_FAIL;
}
- printf("This code should not be executed.\n");
- return PTS_UNRESOLVED;
+ printf("Test FAILED: correct %d oits.it_interval %d\n",
+ RELOADVAL, (int)oits.it_interval.tv_sec);
+ return PTS_FAIL;
}
hooks/post-receive
--
ltp
|
