mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-12-11 19:03:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ab/bsd-fixes'

Browse Source 
Test portability fix.

* ab/bsd-fixes:
  commit-graph tests: fix unportable "dd" invocation
  tests: fix unportable "\?" and "\+" regex syntax
This commit is contained in:
Junio C Hamano 2019-02-22 21:20:19 -08:00
commit c65a2884ea
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t5318-commit-graph.sh
View File

@ -382,7 +382,7 @@ corrupt_graph_and_verify() {
test_when_finished mv commit-graph-backup $objdir/info/commit-graph && test_when_finished mv commit-graph-backup $objdir/info/commit-graph &&
cp $objdir/info/commit-graph commit-graph-backup && cp $objdir/info/commit-graph commit-graph-backup &&
printf "$data" | dd of="$objdir/info/commit-graph" bs=1 seek="$pos" conv=notrunc && printf "$data" | dd of="$objdir/info/commit-graph" bs=1 seek="$pos" conv=notrunc &&
dd of="$objdir/info/commit-graph" bs=1 seek="$zero_pos" count=0 && dd of="$objdir/info/commit-graph" bs=1 seek="$zero_pos" if=/dev/null &&
generate_zero_bytes $(($orig_size - $zero_pos)) >>"$objdir/info/commit-graph" && generate_zero_bytes $(($orig_size - $zero_pos)) >>"$objdir/info/commit-graph" &&
test_must_fail git commit-graph verify 2>test_err && test_must_fail git commit-graph verify 2>test_err &&
grep -v "^+" test_err >err && grep -v "^+" test_err >err &&

8
t/t6120-describe.sh
View File

@ -146,7 +146,7 @@ check_describe A-* HEAD
test_expect_success 'describe works from outside repo using --git-dir' ' test_expect_success 'describe works from outside repo using --git-dir' '
git clone --bare "$TRASH_DIRECTORY" "$TRASH_DIRECTORY/bare" && git clone --bare "$TRASH_DIRECTORY" "$TRASH_DIRECTORY/bare" &&
git --git-dir "$TRASH_DIRECTORY/bare" describe >out && git --git-dir "$TRASH_DIRECTORY/bare" describe >out &&
grep "^A-[1-9][0-9]\?-g[0-9a-f]\+$" out grep -E "^A-[1-9][0-9]?-g[0-9a-f]+$" out
' '
check_describe "A-*[0-9a-f]" --dirty check_describe "A-*[0-9a-f]" --dirty
@ -156,7 +156,7 @@ test_expect_success 'describe --dirty with --work-tree' '
cd "$TEST_DIRECTORY" && cd "$TEST_DIRECTORY" &&
git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out" git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out"
) && ) &&
grep "^A-[1-9][0-9]\?-g[0-9a-f]\+$" out grep -E "^A-[1-9][0-9]?-g[0-9a-f]+$" out
' '
test_expect_success 'set-up dirty work tree' ' test_expect_success 'set-up dirty work tree' '
@ -170,7 +170,7 @@ test_expect_success 'describe --dirty with --work-tree (dirty)' '
cd "$TEST_DIRECTORY" && cd "$TEST_DIRECTORY" &&
git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out" git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out"
) && ) &&
grep "^A-[1-9][0-9]\?-g[0-9a-f]\+-dirty$" out grep -E "^A-[1-9][0-9]?-g[0-9a-f]+-dirty$" out
' '
check_describe "A-*[0-9a-f].mod" --dirty=.mod check_describe "A-*[0-9a-f].mod" --dirty=.mod
@ -180,7 +180,7 @@ test_expect_success 'describe --dirty=.mod with --work-tree (dirty)' '
cd "$TEST_DIRECTORY" && cd "$TEST_DIRECTORY" &&
git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty=.mod >"$TRASH_DIRECTORY/out" git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty=.mod >"$TRASH_DIRECTORY/out"
) && ) &&
grep "^A-[1-9][0-9]\?-g[0-9a-f]\+.mod$" out grep -E "^A-[1-9][0-9]?-g[0-9a-f]+.mod$" out
' '
test_expect_success 'describe --dirty HEAD' ' test_expect_success 'describe --dirty HEAD' '