diff options
| -rw-r--r-- | src/intel/Makefile.compiler.am | 38 | ||||
| -rw-r--r-- | src/intel/compiler/test_eu_compact.cpp (renamed from src/intel/compiler/test_eu_compact.c) | 2 |
2 files changed, 13 insertions, 27 deletions
diff --git a/src/intel/Makefile.compiler.am b/src/intel/Makefile.compiler.am index b30c01a5bde..3ab550c96b1 100644 --- a/src/intel/Makefile.compiler.am +++ b/src/intel/Makefile.compiler.am @@ -45,6 +45,7 @@ EXTRA_DIST += \ # ---------------------------------------------------------------------------- TEST_LIBS = \ + $(top_builddir)/src/gtest/libgtest.la \ compiler/libintel_compiler.la \ common/libintel_common.la \ $(top_builddir)/src/compiler/nir/libnir.la \ @@ -69,53 +70,38 @@ check_PROGRAMS += $(COMPILER_TESTS) compiler_test_fs_cmod_propagation_SOURCES = \ compiler/test_fs_cmod_propagation.cpp -compiler_test_fs_cmod_propagation_LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - $(TEST_LIBS) +compiler_test_fs_cmod_propagation_LDADD = $(TEST_LIBS) compiler_test_fs_copy_propagation_SOURCES = \ compiler/test_fs_copy_propagation.cpp -compiler_test_fs_copy_propagation_LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - $(TEST_LIBS) +compiler_test_fs_copy_propagation_LDADD = $(TEST_LIBS) compiler_test_fs_saturate_propagation_SOURCES = \ compiler/test_fs_saturate_propagation.cpp -compiler_test_fs_saturate_propagation_LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - $(TEST_LIBS) +compiler_test_fs_saturate_propagation_LDADD = $(TEST_LIBS) compiler_test_vf_float_conversions_SOURCES = \ compiler/test_vf_float_conversions.cpp -compiler_test_vf_float_conversions_LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - $(TEST_LIBS) +compiler_test_vf_float_conversions_LDADD = $(TEST_LIBS) compiler_test_vec4_register_coalesce_SOURCES = \ compiler/test_vec4_register_coalesce.cpp -compiler_test_vec4_register_coalesce_LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - $(TEST_LIBS) +compiler_test_vec4_register_coalesce_LDADD = $(TEST_LIBS) compiler_test_vec4_copy_propagation_SOURCES = \ compiler/test_vec4_copy_propagation.cpp -compiler_test_vec4_copy_propagation_LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - $(TEST_LIBS) +compiler_test_vec4_copy_propagation_LDADD = $(TEST_LIBS) compiler_test_vec4_cmod_propagation_SOURCES = \ compiler/test_vec4_cmod_propagation.cpp -compiler_test_vec4_cmod_propagation_LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - $(TEST_LIBS) +compiler_test_vec4_cmod_propagation_LDADD = $(TEST_LIBS) +# Strictly speaking this is neither a C++ test nor using gtest - we can address +# address that at a later point. Until then, this allows us a to simplify things. compiler_test_eu_compact_SOURCES = \ - compiler/test_eu_compact.c -nodist_EXTRA_compiler_test_eu_compact_SOURCES = dummy.cpp + compiler/test_eu_compact.cpp compiler_test_eu_compact_LDADD = $(TEST_LIBS) compiler_test_eu_validate_SOURCES = \ compiler/test_eu_validate.cpp -compiler_test_eu_validate_LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - $(TEST_LIBS) +compiler_test_eu_validate_LDADD = $(TEST_LIBS) diff --git a/src/intel/compiler/test_eu_compact.c b/src/intel/compiler/test_eu_compact.cpp index 77a57f4aa65..39e7f1a27c3 100644 --- a/src/intel/compiler/test_eu_compact.c +++ b/src/intel/compiler/test_eu_compact.cpp @@ -288,7 +288,7 @@ run_tests(const struct gen_device_info *devinfo) int main(int argc, char **argv) { - struct gen_device_info *devinfo = calloc(1, sizeof(*devinfo)); + struct gen_device_info *devinfo = (struct gen_device_info *)calloc(1, sizeof(*devinfo)); devinfo->gen = 6; bool fail = false; |