microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge branch 'ps/test-chmtime-get' 

Test cleanup.

* ps/test-chmtime-get:
  t/helper: 'test-chmtime (--get|-g)' to print only the mtime
This commit is contained in:
Junio C Hamano 2018-04-25 13:29:00 +09:00
Родитель 3d5a179ec0 decf711fc1
Коммит deb9845a0a
10 изменённых файлов: 63 добавлений и 42 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

44
t/helper/test-chmtime.c
Просмотреть файл

@ -18,20 +18,30 @@
*
* Examples:
*
* To just print the mtime use --verbose and set the file mtime offset to 0:
* To print the mtime and the file name use --verbose and set
* the file mtime offset to 0:
*
* test-tool chmtime -v +0 file
*
* To print only the mtime use --get:
*
* test-tool chmtime --get file
*
* To set the mtime to current time:
*
* test-tool chmtime =+0 file
*
* To set the file mtime offset to +1 and print the new value:
*
* test-tool chmtime --get +1 file
*
*/
#include "test-tool.h"
#include "git-compat-util.h"
#include <utime.h>
static const char usage_str[] = "-v|--verbose (+|=|=+|=-|-)<seconds> <file>...";
static const char usage_str[] =
"(-v|--verbose|-g|--get) (+|=|=+|=-|-)<seconds> <file>...";
static int timespec_arg(const char *arg, long int *set_time, int *set_eq)
{
@ -47,7 +57,6 @@ static int timespec_arg(const char *arg, long int *set_time, int *set_eq)
}
*set_time = strtol(timespec, &test, 10);
if (*test) {
fprintf(stderr, "Not a base-10 integer: %s\n", arg + 1);
return 0;
}
if ((*set_eq && *set_time < 0) || *set_eq == 2) {
@ -60,6 +69,7 @@ static int timespec_arg(const char *arg, long int *set_time, int *set_eq)
int cmd__chmtime(int argc, const char **argv)
{
static int verbose;
static int get;
int i = 1;
/* no mtime change by default */
@ -69,18 +79,34 @@ int cmd__chmtime(int argc, const char **argv)
if (argc < 3)
goto usage;
if (strcmp(argv[i], "--verbose") == 0 || strcmp(argv[i], "-v") == 0) {
if (strcmp(argv[i], "--get") == 0 || strcmp(argv[i], "-g") == 0) {
get = 1;
++i;
} else if (strcmp(argv[i], "--verbose") == 0 || strcmp(argv[i], "-v") == 0) {
verbose = 1;
++i;
}
if (timespec_arg(argv[i], &set_time, &set_eq))
if (i == argc) {
goto usage;
}
if (timespec_arg(argv[i], &set_time, &set_eq)) {
++i;
else
} else {
if (get == 0) {
fprintf(stderr, "Not a base-10 integer: %s\n", argv[i] + 1);
goto usage;
}
}
if (i == argc)
goto usage;
for (; i < argc; i++) {
struct stat sb;
struct utimbuf utb;
uintmax_t mtime;
if (stat(argv[i], &sb) < 0) {
fprintf(stderr, "Failed to stat %s: %s\n",
@ -100,8 +126,10 @@ int cmd__chmtime(int argc, const char **argv)
utb.actime = sb.st_atime;
utb.modtime = set_eq ? set_time : sb.st_mtime + set_time;
if (verbose) {
uintmax_t mtime = utb.modtime < 0 ? 0: utb.modtime;
mtime = utb.modtime < 0 ? 0: utb.modtime;
if (get) {
printf("%"PRIuMAX"\n", mtime);
} else if (verbose) {
printf("%"PRIuMAX"\t%s\n", mtime, argv[i]);
}

4
t/t2022-checkout-paths.sh
Просмотреть файл

@ -73,8 +73,8 @@ test_expect_success 'do not touch files that are already up-to-date' '
git checkout HEAD -- file1 file2 &&
echo one >expect &&
test_cmp expect file1 &&
echo "1000000000 file2" >expect &&
test-tool chmtime -v +0 file2 >actual &&
echo "1000000000" >expect &&
test-tool chmtime --get file2 >actual &&
test_cmp expect actual
'

2
t/t3404-rebase-interactive.sh
Просмотреть файл

@ -717,7 +717,7 @@ test_expect_success 'avoid unnecessary reset' '
set_fake_editor &&
git rebase -i HEAD~4 &&
test $HEAD = $(git rev-parse HEAD) &&
MTIME=$(test-tool chmtime -v +0 file3 | sed 's/[^0-9].*$//') &&
MTIME=$(test-tool chmtime --get file3) &&
test 123456789 = $MTIME
'

4
t/t3510-cherry-pick-sequence.sh
Просмотреть файл

@ -247,9 +247,9 @@ test_expect_success '--abort after last commit in sequence' '
test_expect_success 'cherry-pick does not implicitly stomp an existing operation' '
pristine_detach initial &&
test_expect_code 1 git cherry-pick base..anotherpick &&
test-tool chmtime -v +0 .git/sequencer >expect &&
test-tool chmtime --get .git/sequencer >expect &&
test_expect_code 128 git cherry-pick unrelatedpick &&
test-tool chmtime -v +0 .git/sequencer >actual &&
test-tool chmtime --get .git/sequencer >actual &&
test_cmp expect actual
'

8
t/t4200-rerere.sh
Просмотреть файл

@ -166,7 +166,7 @@ test_expect_success 'first postimage wins' '
git commit -q -a -m "prefer first over second" &&
test -f $rr/postimage &&
oldmtimepost=$(test-tool chmtime -v -60 $rr/postimage | cut -f 1) &&
oldmtimepost=$(test-tool chmtime --get -60 $rr/postimage) &&
git checkout -b third master &&
git show second^:a1 | sed "s/To die: t/To die! T/" >a1 &&
@ -179,7 +179,7 @@ test_expect_success 'first postimage wins' '
'
test_expect_success 'rerere updates postimage timestamp' '
newmtimepost=$(test-tool chmtime -v +0 $rr/postimage | cut -f 1) &&
newmtimepost=$(test-tool chmtime --get $rr/postimage) &&
test $oldmtimepost -lt $newmtimepost
'
@ -512,7 +512,7 @@ test_expect_success 'multiple identical conflicts' '
count_pre_post 2 0 &&
# Pretend that the conflicts were made quite some time ago
find .git/rr-cache/ -type f | xargs test-tool chmtime -172800 &&
test-tool chmtime -172800 $(find .git/rr-cache/ -type f) &&
# Unresolved entries have not expired yet
git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
@ -568,7 +568,7 @@ test_expect_success 'multiple identical conflicts' '
git rerere &&
# Pretend that the resolutions are old again
find .git/rr-cache/ -type f | xargs test-tool chmtime -172800 &&
test-tool chmtime -172800 $(find .git/rr-cache/ -type f) &&
# Resolved entries have not expired yet
git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&

2
t/t5000-tar-tree.sh
Просмотреть файл

@ -192,7 +192,7 @@ test_expect_success \
'validate file modification time' \
'mkdir extract &&
"$TAR" xf b.tar -C extract a/a &&
test-tool chmtime -v +0 extract/a/a |cut -f 1 >b.mtime &&
test-tool chmtime --get extract/a/a >b.mtime &&
echo "1117231200" >expected.mtime &&
test_cmp expected.mtime b.mtime'

25
t/t6022-merge-rename.sh
Просмотреть файл

@ -635,10 +635,9 @@ test_expect_success 'setup avoid unnecessary update, normal rename' '
test_expect_success 'avoid unnecessary update, normal rename' '
git checkout -q avoid-unnecessary-update-1^0 &&
test-tool chmtime =1000000000 rename &&
test-tool chmtime -v +0 rename >expect &&
test-tool chmtime --get =1000000000 rename >expect &&
git merge merge-branch-1 &&
test-tool chmtime -v +0 rename >actual &&
test-tool chmtime --get rename >actual &&
test_cmp expect actual # "rename" should have stayed intact
'
@ -668,10 +667,9 @@ test_expect_success 'setup to test avoiding unnecessary update, with D/F conflic
test_expect_success 'avoid unnecessary update, with D/F conflict' '
git checkout -q avoid-unnecessary-update-2^0 &&
test-tool chmtime =1000000000 df &&
test-tool chmtime -v +0 df >expect &&
test-tool chmtime --get =1000000000 df >expect &&
git merge merge-branch-2 &&
test-tool chmtime -v +0 df >actual &&
test-tool chmtime --get df >actual &&
test_cmp expect actual # "df" should have stayed intact
'
@ -700,10 +698,9 @@ test_expect_success 'setup avoid unnecessary update, dir->(file,nothing)' '
test_expect_success 'avoid unnecessary update, dir->(file,nothing)' '
git checkout -q master^0 &&
test-tool chmtime =1000000000 df &&
test-tool chmtime -v +0 df >expect &&
test-tool chmtime --get =1000000000 df >expect &&
git merge side &&
test-tool chmtime -v +0 df >actual &&
test-tool chmtime --get df >actual &&
test_cmp expect actual # "df" should have stayed intact
'
@ -730,10 +727,9 @@ test_expect_success 'setup avoid unnecessary update, modify/delete' '
test_expect_success 'avoid unnecessary update, modify/delete' '
git checkout -q master^0 &&
test-tool chmtime =1000000000 file &&
test-tool chmtime -v +0 file >expect &&
test-tool chmtime --get =1000000000 file >expect &&
test_must_fail git merge side &&
test-tool chmtime -v +0 file >actual &&
test-tool chmtime --get file >actual &&
test_cmp expect actual # "file" should have stayed intact
'
@ -759,10 +755,9 @@ test_expect_success 'setup avoid unnecessary update, rename/add-dest' '
test_expect_success 'avoid unnecessary update, rename/add-dest' '
git checkout -q master^0 &&
test-tool chmtime =1000000000 newfile &&
test-tool chmtime -v +0 newfile >expect &&
test-tool chmtime --get =1000000000 newfile >expect &&
git merge side &&
test-tool chmtime -v +0 newfile >actual &&
test-tool chmtime --get newfile >actual &&
test_cmp expect actual # "file" should have stayed intact
'

6
t/t6501-freshen-objects.sh
Просмотреть файл

@ -72,8 +72,7 @@ for repack in '' true; do
'
test_expect_success "simulate time passing ($title)" '
find .git/objects -type f |
xargs test-tool chmtime -v -86400
test-tool chmtime --get -86400 $(find .git/objects -type f)
'
test_expect_success "start writing new commit with old blob ($title)" '
@ -103,8 +102,7 @@ for repack in '' true; do
test_expect_success "abandon objects again ($title)" '
git reset --hard HEAD^ &&
find .git/objects -type f |
xargs test-tool chmtime -v -86400
test-tool chmtime --get -86400 $(find .git/objects -type f)
'
test_expect_success "start writing new commit with same tree ($title)" '

4
t/t7508-status.sh
Просмотреть файл

@ -1674,10 +1674,10 @@ test_expect_success '"Initial commit" should not be noted in commit template' '
test_expect_success '--no-optional-locks prevents index update' '
test-tool chmtime =1234567890 .git/index &&
git --no-optional-locks status &&
test-tool chmtime -v +0 .git/index >out &&
test-tool chmtime --get .git/index >out &&
grep ^1234567890 out &&
git status &&
test-tool chmtime -v +0 .git/index >out &&
test-tool chmtime --get .git/index >out &&
! grep ^1234567890 out
'

6
t/t7701-repack-unpack-unreachable.sh
Просмотреть файл

@ -55,8 +55,8 @@ test_expect_success '-A with -d option leaves unreachable objects unpacked' '
compare_mtimes ()
{
read tref rest &&
while read t rest; do
read tref &&
while read t; do
test "$tref" = "$t" || return 1
done
}
@ -90,7 +90,7 @@ test_expect_success 'unpacked objects receive timestamp of pack file' '
tmppack=".git/objects/pack/tmp_pack" &&
ln "$packfile" "$tmppack" &&
git repack -A -l -d &&
test-tool chmtime -v +0 "$tmppack" "$fsha1path" "$csha1path" "$tsha1path" \
test-tool chmtime --get "$tmppack" "$fsha1path" "$csha1path" "$tsha1path" \
> mtimes &&
compare_mtimes < mtimes
'