diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-15 09:43:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-15 09:43:42 -0700 |
| commit | 33eacd3ff43e49109594c44e93b7ee66725fb8af (patch) | |
| tree | 0a02655395cdd4623ab5ba915df57c16e1a4d9a4 | |
| parent | 5c9159de87e41cf14ec5f2132afb5a06f35c26b3 (diff) | |
| parent | 6b9c38e14cd3abf9b95cabe8b86954f0c4e94a38 (diff) | |
| download | git-33eacd3ff43e49109594c44e93b7ee66725fb8af.tar.gz | |
Merge branch 'jk/tzoffset-fix' into maint
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
| -rw-r--r-- | help.c | 6 | ||||
| -rwxr-xr-x | t/t0006-date.sh | 6 | ||||
| -rw-r--r-- | t/test-lib.sh | 9 |
3 files changed, 18 insertions, 3 deletions
@@ -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". */ 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; } diff --git a/t/t0006-date.sh b/t/t0006-date.sh index 04ce53509c..4c8cf58512 100755 --- a/t/t0006-date.sh +++ b/t/t0006-date.sh @@ -31,7 +31,7 @@ check_show () { format=$1 time=$2 expect=$3 - test_expect_${4:-success} "show date ($format:$time)" ' + test_expect_success $4 "show date ($format:$time)" ' echo "$time -> $expect" >expect && test-date show:$format "$time" >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 FUTURE="5758122296 -0400" -check_show iso "$FUTURE" "2152-06-19 18:24:56 -0400" -check_show iso-local "$FUTURE" "2152-06-19 22:24:56 +0000" +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" LONG_IS_64BIT check_parse() { echo "$1 -> $2" >expect diff --git a/t/test-lib.sh b/t/test-lib.sh index 0055ebba46..11201e9cf8 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1111,3 +1111,12 @@ run_with_limited_cmdline () { } 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)" +' |