[Mesa-dev] [PATCH] r300g: Fix path to test programs for out-of-tree builds

[Tom Stellard]

On Tue, Aug 19, 2014 at 11:17:49AM +0900, Michel Dänzer wrote:
> From: Michel Dänzer <michel.daenzer at amd.com>
> 
> Fixes make check in that case.
> 
Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
> ---
>  src/gallium/drivers/r300/Makefile.am                      | 1 +
>  src/gallium/drivers/r300/compiler/tests/rc_test_helpers.c | 2 +-
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am
> index e74e445..f5107f8 100644
> --- a/src/gallium/drivers/r300/Makefile.am
> +++ b/src/gallium/drivers/r300/Makefile.am
> @@ -22,6 +22,7 @@ r300_compiler_tests_LDADD = libr300.la libr300-helper.la \
>  	$(top_builddir)/src/util/libmesautil.la \
>  	$(GALLIUM_COMMON_LIB_DEPS)
>  r300_compiler_tests_CPPFLAGS = \
> +	-DTEST_PATH=\"$(top_srcdir)/src/gallium/drivers/r300/compiler/tests\" \
>  	-I$(top_srcdir)/src/gallium/drivers/r300/compiler
>  r300_compiler_tests_SOURCES = $(COMPILER_TESTS_SOURCES)
>  
> diff --git a/src/gallium/drivers/r300/compiler/tests/rc_test_helpers.c b/src/gallium/drivers/r300/compiler/tests/rc_test_helpers.c
> index 239a762..7c9d177 100644
> --- a/src/gallium/drivers/r300/compiler/tests/rc_test_helpers.c
> +++ b/src/gallium/drivers/r300/compiler/tests/rc_test_helpers.c
> @@ -543,7 +543,7 @@ unsigned load_program(
>  	unsigned i = 0;
>  
>  	memset(line, 0, sizeof(line));
> -	snprintf(path, MAX_PATH_LENGTH, "compiler/tests/%s", filename);
> +	snprintf(path, MAX_PATH_LENGTH, TEST_PATH "/%s", filename);
>  	file = fopen(path, "r");
>  	if (!file) {
>  		return 0;
> -- 
> 2.1.0
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev