undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/tzoffset-fix' into maint

Browse Source 
Skip tests that are unrunnable on platforms without 64-bit long
to avoid unnecessary test failures.

* jk/tzoffset-fix:
  t0006: skip "far in the future" test when unsigned long is not long enough
This commit is contained in:
Junio C Hamano 2016-07-15 09:43:42 -07:00
commit 33eacd3ff4
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
help.c
View File

@ -419,6 +419,12 @@ int cmd_version(int argc, const char **argv, const char *prefix)
* with external projects that rely on the output of "git version". * with external projects that rely on the output of "git version".
*/ */
printf("git version %s\n", git_version_string); printf("git version %s\n", git_version_string);
while (*++argv) {
if (!strcmp(*argv, "--build-options")) {
printf("sizeof-long: %d\n", (int)sizeof(long));
/* NEEDSWORK: also save and output GIT-BUILD_OPTIONS? */
}
}
return 0; return 0;
} }

6
t/t0006-date.sh
View File

@ -31,7 +31,7 @@ check_show () {
format=$1 format=$1
time=$2 time=$2
expect=$3 expect=$3
test_expect_${4:-success} "show date ($format:$time)" ' test_expect_success $4 "show date ($format:$time)" '
echo "$time -> $expect" >expect && echo "$time -> $expect" >expect &&
test-date show:$format "$time" >actual && test-date show:$format "$time" >actual &&
test_cmp expect actual test_cmp expect actual
@ -50,8 +50,8 @@ check_show iso-local "$TIME" '2016-06-15 14:13:20 +0000'
# arbitrary time absurdly far in the future # arbitrary time absurdly far in the future
FUTURE="5758122296 -0400" FUTURE="5758122296 -0400"
check_show iso "$FUTURE" "2152-06-19 18:24:56 -0400" check_show iso "$FUTURE" "2152-06-19 18:24:56 -0400" LONG_IS_64BIT
check_show iso-local "$FUTURE" "2152-06-19 22:24:56 +0000" check_show iso-local "$FUTURE" "2152-06-19 22:24:56 +0000" LONG_IS_64BIT
check_parse() { check_parse() {
echo "$1 -> $2" >expect echo "$1 -> $2" >expect

9
t/test-lib.sh
View File

@ -1111,3 +1111,12 @@ run_with_limited_cmdline () {
} }
test_lazy_prereq CMDLINE_LIMIT 'run_with_limited_cmdline true' test_lazy_prereq CMDLINE_LIMIT 'run_with_limited_cmdline true'
build_option () {
git version --build-options |
sed -ne "s/^$1: //p"
}
test_lazy_prereq LONG_IS_64BIT '
test 8 -le "$(build_option sizeof-long)"
'