test-patchset: Make a copy of const_structs.checkpatch

Message ID 20171005213357.4369-1-daniel.thompson@linaro.org
State New
Headers show
Series
  • test-patchset: Make a copy of const_structs.checkpatch
Related show

Commit Message

Daniel Thompson Oct. 5, 2017, 9:33 p.m.
Currently aiaiai issues the following warning for each patch under test
because recent versions of checkpatch look for a list of structures in
scripts/const_structs.checkpatch .

This patch fixes the problem by copying out the extra file (if one is
found).

Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>

---
 aiaiai-test-patchset | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

-- 
2.9.5

Comments

Keller, Jacob E Oct. 5, 2017, 10:25 p.m. | #1
> -----Original Message-----

> From: Daniel Thompson [mailto:daniel.thompson@linaro.org]

> Sent: Thursday, October 05, 2017 2:34 PM

> To: Keller, Jacob E <jacob.e.keller@intel.com>

> Cc: Daniel Thompson <daniel.thompson@linaro.org>; aiaiai@lists.infradead.org;

> patches@linaro.org; Lee Jones <lee.jones@linaro.org>

> Subject: [PATCH] test-patchset: Make a copy of const_structs.checkpatch

> 

> Currently aiaiai issues the following warning for each patch under test

> because recent versions of checkpatch look for a list of structures in

> scripts/const_structs.checkpatch .

> 

> This patch fixes the problem by copying out the extra file (if one is

> found).

> 

> Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>


Applied.

Thanks,
Jake

> ---

>  aiaiai-test-patchset | 8 +++++++-

>  1 file changed, 7 insertions(+), 1 deletion(-)

> 

> diff --git a/aiaiai-test-patchset b/aiaiai-test-patchset

> index 6193dfcae0f1..0ecbac68e9fd 100755

> --- a/aiaiai-test-patchset

> +++ b/aiaiai-test-patchset

> @@ -481,12 +481,18 @@ if [ -n "$checkpatch" ]; then

>  		git show "$commit_id1:scripts/checkpatch.pl" > "$checkpatch_pl"

>  		chmod $verbose u+x "$checkpatch_pl" >&2

> 

> -		# Also grab the typo corrections if the kernel under test has

> +		# Grab the typo corrections if the kernel under test has

>  		# one (no need to report errors... if something is weird

>  		# checkpatch will let us know).

>  		if git cat-file -e "$commit_id1:scripts/spelling.txt" 2>/dev/null;

> then

>  			git show "$commit_id1:scripts/spelling.txt" >

> "$tmpdir/checkpatch/spelling.txt"

>  		fi

> +

> +		# Also grab the list of constant structures (if present in this

> kernel)

> +		if git cat-file -e "$commit_id1:scripts/const_structs.checkpatch"

> 2>/dev/null; then

> +			git show "$commit_id1:scripts/const_structs.checkpatch"

> > "$tmpdir/checkpatch/const_structs.checkpatch"

> +		fi

> +

>  	else

>  		verbose "Can't find checkpatch.pl.. disabling checkpatch tests."

>  		checkpatch=

> --

> 2.9.5

Patch

diff --git a/aiaiai-test-patchset b/aiaiai-test-patchset
index 6193dfcae0f1..0ecbac68e9fd 100755
--- a/aiaiai-test-patchset
+++ b/aiaiai-test-patchset
@@ -481,12 +481,18 @@  if [ -n "$checkpatch" ]; then
 		git show "$commit_id1:scripts/checkpatch.pl" > "$checkpatch_pl"
 		chmod $verbose u+x "$checkpatch_pl" >&2
 
-		# Also grab the typo corrections if the kernel under test has
+		# Grab the typo corrections if the kernel under test has
 		# one (no need to report errors... if something is weird
 		# checkpatch will let us know).
 		if git cat-file -e "$commit_id1:scripts/spelling.txt" 2>/dev/null; then
 			git show "$commit_id1:scripts/spelling.txt" > "$tmpdir/checkpatch/spelling.txt"
 		fi
+
+		# Also grab the list of constant structures (if present in this kernel)
+		if git cat-file -e "$commit_id1:scripts/const_structs.checkpatch" 2>/dev/null; then
+			git show "$commit_id1:scripts/const_structs.checkpatch" > "$tmpdir/checkpatch/const_structs.checkpatch"
+		fi
+
 	else
 		verbose "Can't find checkpatch.pl.. disabling checkpatch tests."
 		checkpatch=