fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 11:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

r300g: Fix path to test programs for out-of-tree builds

Browse source 
Fixes make check in that case.

Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
This commit is contained in:
Michel Dänzer 2014-08-19 11:00:16 +09:00 • committed by Michel Dänzer
parent c04a6d5c29
commit cd765cf7ee
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/drivers/r300/Makefile.am
View file

@ -22,6 +22,7 @@ r300_compiler_tests_LDADD = libr300.la libr300-helper.la \
$(top_builddir)/src/util/libmesautil.la \ $(top_builddir)/src/util/libmesautil.la \
$(GALLIUM_COMMON_LIB_DEPS) $(GALLIUM_COMMON_LIB_DEPS)
r300_compiler_tests_CPPFLAGS = \ r300_compiler_tests_CPPFLAGS = \
-DTEST_PATH=\"$(top_srcdir)/src/gallium/drivers/r300/compiler/tests\" \
-I$(top_srcdir)/src/gallium/drivers/r300/compiler -I$(top_srcdir)/src/gallium/drivers/r300/compiler
r300_compiler_tests_SOURCES = $(COMPILER_TESTS_SOURCES) r300_compiler_tests_SOURCES = $(COMPILER_TESTS_SOURCES)

2
src/gallium/drivers/r300/compiler/tests/rc_test_helpers.c
View file

@ -543,7 +543,7 @@ unsigned load_program(
unsigned i = 0; unsigned i = 0;
memset(line, 0, sizeof(line)); 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"); file = fopen(path, "r");
if (!file) { if (!file) {
return 0; return 0;