[apparmor] [patch 1/9] profiles - fix make check

[Seth Arnold]

On Tue, Dec 18, 2012 at 06:17:56AM -0800, Steve Beattie wrote:
> When I corrected the profiles/Makefile to automatically find files to
> install, I converted one variable name but missed a later location where
> that variable was used, which broke the 'make check' target, because
> directories would be handed to the apparmor parser. This patch corrects
> that and also makes the VERBOSE flag report each profile name as it's
> being handed to the parser.
> 
> ---
>  profiles/Makefile |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Acked-By: Seth Arnold <seth.arnold at canonical.com>

> Index: b/profiles/Makefile
> ===================================================================
> --- a/profiles/Makefile
> +++ b/profiles/Makefile
> @@ -81,12 +81,13 @@ LOGPROF=perl -I../utils/ ../utils/aa-log
>  endif
>  
>  IGNORE_FILES=${EXTRAS_SOURCE}/README
> -CHECK_PROFILES=$(filter-out ${IGNORE_FILES} ${SUBDIRS_MUST_BE_SKIPPED}, $(wildcard ${PROFILES_SOURCE}/*) $(wildcard ${EXTRAS_SOURCE}/*))
> +CHECK_PROFILES=$(filter-out ${IGNORE_FILES} ${SUBDIRS}, $(wildcard ${PROFILES_SOURCE}/*) $(wildcard ${EXTRAS_SOURCE}/*))
>  
>  .PHONY: check
>  check:
>  	@echo "*** Checking profiles from ${PROFILES_SOURCE} and ${EXTRAS_SOURCE} against apparmor_parser"
>  	$(Q)for profile in ${CHECK_PROFILES} ; do \
> +	        [ -n "${VERBOSE}" ] && echo "Testing $${profile}" ; \
>  		${PARSER} -S -b ${PWD}/apparmor.d $${profile} > /dev/null || exit 1; \
>  	done
>  	@echo "*** Checking profiles from ${PROFILES_SOURCE} against logprof"
> 
> 
> -- 
> AppArmor mailing list
> AppArmor at lists.ubuntu.com
> Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 490 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20121218/e8c2cb20/attachment.pgp>