mirror of
https://github.com/git/git
synced 2024-09-29 21:27:13 +00:00
Merge branch 'kl/test-fixes' into maint-2.46
A flakey test and incorrect calls to strtoX() functions have been fixed. * kl/test-fixes: t6421: fix test to work when repo dir contains d0 set errno=0 before strtoX calls
This commit is contained in:
commit
24a64ea0eb
|
@ -35,6 +35,7 @@ int cmd_get_tar_commit_id(int argc, const char **argv UNUSED, const char *prefix
|
|||
if (header->typeflag[0] != TYPEFLAG_GLOBAL_HEADER)
|
||||
return 1;
|
||||
|
||||
errno = 0;
|
||||
len = strtol(content, &end, 10);
|
||||
if (errno == ERANGE || end == content || len < 0)
|
||||
return 1;
|
||||
|
|
|
@ -1628,6 +1628,7 @@ static void grab_date(const char *buf, struct atom_value *v, const char *atomnam
|
|||
timestamp = parse_timestamp(eoemail + 2, &zone, 10);
|
||||
if (timestamp == TIME_MAX)
|
||||
goto bad;
|
||||
errno = 0;
|
||||
tz = strtol(zone, NULL, 10);
|
||||
if ((tz == LONG_MIN || tz == LONG_MAX) && errno == ERANGE)
|
||||
goto bad;
|
||||
|
|
|
@ -415,6 +415,7 @@ static void get_i(struct line *line, intmax_t *s_in)
|
|||
|
||||
get_s(line, &s);
|
||||
|
||||
errno = 0;
|
||||
*s_in = strtol(s, &endptr, 10);
|
||||
if (*endptr || errno == ERANGE)
|
||||
die("line[%d]: invalid integer value", line->nr);
|
||||
|
@ -427,6 +428,7 @@ static void get_d(struct line *line, double *s_in)
|
|||
|
||||
get_s(line, &s);
|
||||
|
||||
errno = 0;
|
||||
*s_in = strtod(s, &endptr);
|
||||
if (*endptr || errno == ERANGE)
|
||||
die("line[%d]: invalid float value", line->nr);
|
||||
|
|
|
@ -26,6 +26,7 @@ static int get_i(int *p_value, const char *data)
|
|||
if (!data || !*data)
|
||||
return MyError;
|
||||
|
||||
errno = 0;
|
||||
*p_value = strtol(data, &endptr, 10);
|
||||
if (*endptr || errno == ERANGE)
|
||||
return MyError;
|
||||
|
|
|
@ -230,8 +230,9 @@ test_expect_merge_algorithm failure success 'Objects downloaded for single relev
|
|||
grep fetch_count trace.output | cut -d "|" -f 9 | tr -d " ." >actual &&
|
||||
test_cmp expect actual &&
|
||||
|
||||
# Check the number of fetch commands exec-ed
|
||||
grep d0.*fetch.negotiationAlgorithm trace.output >fetches &&
|
||||
# Check the number of fetch commands exec-ed by filtering trace to
|
||||
# child_start events by the top-level program (2nd field == d0)
|
||||
grep " d0 .* child_start .*fetch.negotiationAlgorithm" trace.output >fetches &&
|
||||
test_line_count = 2 fetches &&
|
||||
|
||||
git rev-list --objects --all --missing=print |
|
||||
|
@ -318,8 +319,9 @@ test_expect_merge_algorithm failure success 'Objects downloaded when a directory
|
|||
grep fetch_count trace.output | cut -d "|" -f 9 | tr -d " ." >actual &&
|
||||
test_cmp expect actual &&
|
||||
|
||||
# Check the number of fetch commands exec-ed
|
||||
grep d0.*fetch.negotiationAlgorithm trace.output >fetches &&
|
||||
# Check the number of fetch commands exec-ed by filtering trace to
|
||||
# child_start events by the top-level program (2nd field == d0)
|
||||
grep " d0 .* child_start .*fetch.negotiationAlgorithm" trace.output >fetches &&
|
||||
test_line_count = 1 fetches &&
|
||||
|
||||
git rev-list --objects --all --missing=print |
|
||||
|
@ -422,8 +424,9 @@ test_expect_merge_algorithm failure success 'Objects downloaded with lots of ren
|
|||
grep fetch_count trace.output | cut -d "|" -f 9 | tr -d " ." >actual &&
|
||||
test_cmp expect actual &&
|
||||
|
||||
# Check the number of fetch commands exec-ed
|
||||
grep d0.*fetch.negotiationAlgorithm trace.output >fetches &&
|
||||
# Check the number of fetch commands exec-ed by filtering trace to
|
||||
# child_start events by the top-level program (2nd field == d0)
|
||||
grep " d0 .* child_start .*fetch.negotiationAlgorithm" trace.output >fetches &&
|
||||
test_line_count = 4 fetches &&
|
||||
|
||||
git rev-list --objects --all --missing=print |
|
||||
|
|
Loading…
Reference in a new issue