summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Dänzer <[email protected]>2014-08-19 11:00:16 +0900
committerMichel Dänzer <[email protected]>2014-08-20 16:12:51 +0900
commitcd765cf7eef3119a9d0c9fdec0973fceed0c8eed (patch)
tree28fe06cd4819e874d539d4171caf6228e2d66f4f
parentc04a6d5c298f102469df45a7dbe81f40c6faed5f (diff)
r300g: Fix path to test programs for out-of-tree builds
Fixes make check in that case. Reviewed-by: Tom Stellard <[email protected]>
-rw-r--r--src/gallium/drivers/r300/Makefile.am1
-rw-r--r--src/gallium/drivers/r300/compiler/tests/rc_test_helpers.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am
index e74e44542be..f5107f8aa9c 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 239a76298fe..7c9d1779df5 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;