diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-22 12:03:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 12:03:15 -0500 |
| commit | f8ff1727eca1ca726f00f5509fae5d9ca024f516 (patch) | |
| tree | c7c773232dfedb027a360a6e18acd257ac13476e /contrib | |
| parent | cb3af5b05bc6c09c5fb905c8fb99c46e493a8b55 (diff) | |
| parent | d9655b0f014bd6b5ad6ebb2b9c11b409cbcb4a22 (diff) | |
| download | podman-f8ff1727eca1ca726f00f5509fae5d9ca024f516.tar.gz podman-f8ff1727eca1ca726f00f5509fae5d9ca024f516.tar.bz2 podman-f8ff1727eca1ca726f00f5509fae5d9ca024f516.zip | |
Merge pull request #9468 from edsantiago/new_test_checker
pr-should-include-tests: recognized "renamed" tests
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/cirrus/pr-should-include-tests | 3 | ||||
| -rwxr-xr-x | contrib/cirrus/pr-should-include-tests.t | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/contrib/cirrus/pr-should-include-tests b/contrib/cirrus/pr-should-include-tests index a3b4847a7..e3c5d5da1 100755 --- a/contrib/cirrus/pr-should-include-tests +++ b/contrib/cirrus/pr-should-include-tests @@ -22,7 +22,8 @@ base=$(git merge-base ${DEST_BRANCH:-master} $head) # A foo.c # M bar.c # We look for Added or Modified (not Deleted!) files under 'test'. -if git diff --name-status $base $head | egrep -q '^[AM]\s+(test/|.*_test\.go)'; then +# --no-renames ensures that renamed tests (#9420) show up as 'A'dded. +if git diff --name-status --no-renames $base $head | egrep -q '^[AM]\s+(test/|.*_test\.go)'; then exit 0 fi diff --git a/contrib/cirrus/pr-should-include-tests.t b/contrib/cirrus/pr-should-include-tests.t index 4618060a3..965a3b574 100755 --- a/contrib/cirrus/pr-should-include-tests.t +++ b/contrib/cirrus/pr-should-include-tests.t @@ -38,6 +38,7 @@ tests=" 0 c342583da 12f835d12 PR 8523, version.go + podman.spec.in 0 c342583da db1d2ff11 version bump to v2.2.0 0 8f75ed958 7b3ad6d89 PR 8835, only a README.md change +0 b6db60e58 f06dd45e0 PR 9420, a test rename " # The script we're testing |