diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2019-10-29 17:10:39 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-10-30 10:32:26 +0000 |
commit | 94323df29462094275e5c837d47a2c6b8302fb3e (patch) | |
tree | 2a0ac8332f17e11b5cd01184664088e246bd407b /git-hooks | |
parent | 1bf0cbf1e48bb768f50e93cf112d81d423322e39 (diff) | |
download | qtrepotools-94323df29462094275e5c837d47a2c6b8302fb3e.tar.gz |
Exempt tests/*/data/ as well as tests/*/testdata/ from the spacing tests
Plenty of existing tests use data/ rather than testdata/ as their data
directories.
Change-Id: I8398c35618313ec9571dd197da040b3f9671e42c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Diffstat (limited to 'git-hooks')
-rwxr-xr-x | git-hooks/sanitize-commit | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-hooks/sanitize-commit b/git-hooks/sanitize-commit index 08a3dab..3a60076 100755 --- a/git-hooks/sanitize-commit +++ b/git-hooks/sanitize-commit @@ -698,7 +698,7 @@ while (<DIFF>) { if ($file =~ /(~|\.(old|bak))$/i) { complain("Adding backup file", "backup") if ($new_file && !defined($cfg{backup})); $ws_check = 0; - } elsif ($file =~ m,^tests/.*/testdata/,) { + } elsif ($file =~ m,^tests/.*/(test)?data/,) { $ws_check = 0; } elsif ($file =~ /\.(prl|la|pc|ilk)$/i) { complain("Adding build artifact", "generated") if ($new_file && !defined($cfg{generated})); |