[Ocfs2-test-devel] [PATCH] dx_dirs_tests: only compile when defined OCFS2_TEST_DX_DIRS

tristan.ye tristan.ye at oracle.com
Sun Mar 22 18:32:16 PDT 2009


Yes, the current mainline-kernel has not included the dx-dirs patches ,
I have no objection with such a temporary strategy:-)

Signed-off-by: Tristan Ye <tristan.ye at oracle.com>

On Sat, 2009-03-21 at 02:08 +0800, Coly Li wrote:
> indexed dir is not in upstream yet, which means compiling dx_dirs_tests code
> with current upstream ocfs2 and ocfs2-tools code will get such error:
> 
> index_dir.c:813: error: ‘OCFS2_FEATURE_INCOMPAT_INDEXED_DIRS’ undeclared (first
> use in this function)
> 
> This patch makes dx_dirs_tests code only compiled when OCFS2_TEST_DX_DIRS is
> defined, which will not break the testing for current upstream code. When index
> dir is upstreamed, we can removed the compiling condition then.
> 
> Signed-off-by: Coly Li <coly.li at suse.de>
> ---
>  programs/Makefile |    7 +++++--
>  1 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/programs/Makefile b/programs/Makefile
> index 4f588ce..56b1e08 100644
> --- a/programs/Makefile
> +++ b/programs/Makefile
> @@ -54,8 +54,11 @@ SUBDIRS =			\
>  	xattr_tests		\
>  	acl_tests		\
>  	quota_tests		\
> -	inode_alloc_perf_tests	\
> -	dx_dirs_tests
> +	inode_alloc_perf_tests
> +
> +ifdef OCFS2_TEST_DX_DIRS
> +	SUBDIRS += dx_dirs_tests
> +endif
> 
>  ifdef OCFS2_TEST_ENABLE_THIRDPARTY
>  SUBDIRS += bonnie dbench iozone postmark
> -- 
> Coly Li
> SuSE Labs
> 
> _______________________________________________
> Ocfs2-test-devel mailing list
> Ocfs2-test-devel at oss.oracle.com
> http://oss.oracle.com/mailman/listinfo/ocfs2-test-devel




More information about the Ocfs2-test-devel mailing list