diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2017-03-15 04:31:42 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2017-03-15 04:31:42 +0000 |
| commit | 300b569364685e5a8bff44048865a18edc9ac6d7 (patch) | |
| tree | c906bb7bc7e2ce040da2107d5dec4393b07dc0ff /regress | |
| parent | 5c2f92bbe57f50e9959e5ad140fa379c31e44209 (diff) | |
Clean up errno handling in fmt_scaled test:
- always clear before calling function under test.
- save immediately after function under test.
- always use saved value for validation and reporting.
- remove "fraction too big" testcase that never atually worked (but looked
like it did because the previous test's errno was never cleared).
- delete unecessary "extern int errno".
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/lib/libutil/fmt_scaled/fmt_test.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/regress/lib/libutil/fmt_scaled/fmt_test.c b/regress/lib/libutil/fmt_scaled/fmt_test.c index 05dfa8bc997..0aeeb554511 100644 --- a/regress/lib/libutil/fmt_scaled/fmt_test.c +++ b/regress/lib/libutil/fmt_scaled/fmt_test.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fmt_test.c,v 1.12 2017/02/25 07:28:32 jsg Exp $ */ +/* $OpenBSD: fmt_test.c,v 1.13 2017/03/15 04:31:41 dtucker Exp $ */ /* * Combined tests for fmt_scaled and scan_scaled. @@ -127,6 +127,7 @@ fmt_test(void) for (i = 0; i < DDATA_LENGTH; i++) { strlcpy(buf, "UNSET", FMT_SCALED_STRSIZE); + errno = 0; ret = fmt_scaled(ddata[i].input, buf); e = errno; if (verbose) { @@ -138,7 +139,7 @@ fmt_test(void) if (ret == -1) errs += assert_int(i, 1, ret, ddata[i].err == 0 ? 0 : -1); if (ddata[i].err) - errs += assert_errno(i, 2, ddata[i].err, errno); + errs += assert_errno(i, 2, ddata[i].err, e); else errs += assert_str(i, 3, ddata[i].expect, buf); } @@ -151,8 +152,6 @@ fmt_test(void) #define IMPROBABLE (-42) -extern int errno; - struct { /* the test cases */ char *input; long long result; @@ -179,7 +178,6 @@ struct { /* the test cases */ { "1234567890", 1234567890LL, 0 }, /* should work */ { "1.5E", 1729382256910270464LL, 0 }, /* big */ { "32948093840918378473209480483092", 0, ERANGE }, /* too big */ - { "329480938409.8378473209480483092", 0, ERANGE }, /* fraction too big */ { "1.5Q", 0, EINVAL }, /* invalid multiplier */ { "1ab", 0, EINVAL }, /* ditto */ { "3&", 0, EINVAL }, /* ditto */ @@ -200,16 +198,15 @@ print_errno(int e) case EINVAL: printf("EINVAL"); break; case EDOM: printf("EDOM"); break; case ERANGE: printf("ERANGE"); break; - default: printf("errno %d", errno); + default: printf("errno %d", e); } } /** Print one result */ static void -print(char *input, long long result, int ret) +print(char *input, long long result, int ret, int e) { - int e = errno; - printf("\"%10s\" --> %lld (%d)", input, result, ret); + printf("\"%40s\" --> %lld (%d)", input, result, ret); if (ret == -1) { printf(" -- "); print_errno(e); @@ -226,17 +223,16 @@ scan_test(void) for (i = 0; i < SDATA_LENGTH; i++) { result = IMPROBABLE; + errno = 0; /* printf("Calling scan_scaled(%s, ...)\n", sdata[i].input); */ ret = scan_scaled(sdata[i].input, &result); e = errno; /* protect across printfs &c. */ if (verbose) - print(sdata[i].input, result, ret); - errno = e; + print(sdata[i].input, result, ret, e); if (ret == -1) errs += assert_int(i, 1, ret, sdata[i].err == 0 ? 0 : -1); - errno = e; if (sdata[i].err) - errs += assert_errno(i, 2, sdata[i].err, errno); + errs += assert_errno(i, 2, sdata[i].err, e); else errs += assert_llong(i, 3, sdata[i].result, result); } |