aboutsummaryrefslogtreecommitdiff
path: root/posix/tst-nice.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2003-03-20 11:40:36 +0000
committerRoland McGrath <roland@gnu.org>2003-03-20 11:40:36 +0000
commit41f3e892d866923e4ad07c4d0e8165ec2237cb22 (patch)
tree17f7f9712dbc690506414bf64d5be632d3d1403a /posix/tst-nice.c
parentb1aea0989d8a14dcddde207d5414b187b3692a9c (diff)
downloadglibc-41f3e892d866923e4ad07c4d0e8165ec2237cb22.tar
glibc-41f3e892d866923e4ad07c4d0e8165ec2237cb22.tar.gz
glibc-41f3e892d866923e4ad07c4d0e8165ec2237cb22.tar.bz2
glibc-41f3e892d866923e4ad07c4d0e8165ec2237cb22.zip
2003-03-20 Roland McGrath <roland@redhat.com>
* posix/tst-nice.c (do_test): Use %m formats instead of printing errno in decimal. Don't bail if niced at start. Just check that nice call bumps the total at all.
Diffstat (limited to 'posix/tst-nice.c')
-rw-r--r--posix/tst-nice.c25
1 files changed, 11 insertions, 14 deletions
diff --git a/posix/tst-nice.c b/posix/tst-nice.c
index 07fe67eafa..2b16ceccac 100644
--- a/posix/tst-nice.c
+++ b/posix/tst-nice.c
@@ -27,40 +27,37 @@ do_test (void)
{
int ret;
const int incr = 10;
- const int expected = 10;
+ int old;
/* Discover current nice value. */
errno = 0;
- ret = nice (0);
- if (ret == -1 && errno != 0)
+ old = nice (0);
+ if (old == -1 && errno != 0)
{
- printf ("break: nice(%d) return: %d, errno: %d\n", 0, ret, errno);
+ printf ("break: nice(%d) return: %d, %m\n", 0, old);
return 1;
}
- /* We cannot generally add up the increments since the values are
- capped. So we run the test only if we initially run at level
- 0. */
- if (ret != 0)
- return 0;
/* Nice ourselves up. */
errno = 0;
ret = nice (incr);
if (ret == -1 && errno != 0)
{
- printf ("break: nice(%d) return: %d, errno: %d\n", incr, ret, errno);
+ printf ("break: nice(%d) return: %d, %m\n", incr, ret);
return 1;
}
/* Check for return value being zero when it shouldn't. Cannot simply
- check for expected value since nice values are capped at 2^n-1. */
- if (ret != expected)
+ check for expected value since nice values are capped at 2^n-1.
+ But we assume that we didn't start at the cap and so should have
+ increased some. */
+ if (ret <= old)
{
- printf ("fail: retval (%d) of nice(%d) != %d\n", ret, incr, expected);
+ printf ("FAIL: retval (%d) of nice(%d) != %d\n", ret, incr, old + incr);
return 1;
}
- printf ("pass: nice(%d) return: %d\n", incr, ret);
+ printf ("PASS: nice(%d) from %d return: %d\n", incr, old, ret);
return 0;
}