summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker/tests/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/state_tracker/tests/Makefile.am')
-rw-r--r--src/mesa/state_tracker/tests/Makefile.am20
1 files changed, 17 insertions, 3 deletions
diff --git a/src/mesa/state_tracker/tests/Makefile.am b/src/mesa/state_tracker/tests/Makefile.am
index a49ad3ee106..0665a880844 100644
--- a/src/mesa/state_tracker/tests/Makefile.am
+++ b/src/mesa/state_tracker/tests/Makefile.am
@@ -17,8 +17,10 @@ AM_CPPFLAGS = \
if HAVE_STD_CXX11
if HAVE_SHARED_GLAPI
-TESTS = st-renumerate-test
-check_PROGRAMS = st-renumerate-test
+TESTS = st-renumerate-test \
+ st-array-merge-test
+check_PROGRAMS = st-renumerate-test \
+ st-array-merge-test
check_LIBRARIES = libmesa-st-tests-common.a
endif
@@ -34,7 +36,13 @@ st_renumerate_test_SOURCES = \
st_renumerate_test_LDFLAGS = \
$(LLVM_LDFLAGS)
-st_renumerate_test_LDADD = \
+st_array_merge_test_SOURCES = \
+ test_glsl_to_tgsi_array_merge.cpp
+
+st_array_merge_test_LDFLAGS = \
+ $(LLVM_LDFLAGS)
+
+st_common_LDADD = \
libmesa-st-tests-common.a \
$(top_builddir)/src/mesa/libmesagallium.la \
$(top_builddir)/src/mapi/shared-glapi/libglapi.la \
@@ -44,4 +52,10 @@ st_renumerate_test_LDADD = \
$(GALLIUM_COMMON_LIB_DEPS) \
$(LLVM_LIBS)
+st_renumerate_test_LDADD = \
+ $(st_common_LDADD)
+
+st_array_merge_test_LDADD = \
+ $(st_common_LDADD)
+
EXTRA_DIST = meson.build