<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">The commit message doesn't really make sense. It looks to me a lot more like we're doing a makefile unification and renaming test_eu_compact is a side-effect.<br></div><div class="gmail_quote"><br>On Wed, Mar 8, 2017 at 9:16 AM, Emil Velikov <span dir="ltr"><<a href="mailto:emil.l.velikov@gmail.com" target="_blank">emil.l.velikov@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Emil Velikov <<a href="mailto:emil.velikov@collabora.com">emil.velikov@collabora.com</a>><br>
<br>
We'd want to rewrite the test to be like the rest, but until then this<br>
gets rid of nice hunk of boilderplate.<br>
<br>
Signed-off-by: Emil Velikov <<a href="mailto:emil.velikov@collabora.com">emil.velikov@collabora.com</a>><br>
---<br>
 src/intel/<a href="http://Makefile.compiler.am" rel="noreferrer" target="_blank">Makefile.compiler.am</a>           | 38 +++++++---------------<br>
 .../{test_eu_compact.c => test_eu_compact.cpp}   | 2 +-<br>
 2 files changed, 13 insertions(+), 27 deletions(-)<br>
 rename src/intel/compiler/{test_eu_<wbr>compact.c => test_eu_compact.cpp} (98%)<br>
<br>
diff --git a/src/intel/<a href="http://Makefile.compiler.am" rel="noreferrer" target="_blank">Makefile.compiler.<wbr>am</a> b/src/intel/<a href="http://Makefile.compiler.am" rel="noreferrer" target="_blank">Makefile.compiler.<wbr>am</a><br>
index c5e5b11ffc..9c8df3adb1 100644<br>
--- a/src/intel/<a href="http://Makefile.compiler.am" rel="noreferrer" target="_blank">Makefile.compiler.<wbr>am</a><br>
+++ b/src/intel/<a href="http://Makefile.compiler.am" rel="noreferrer" target="_blank">Makefile.compiler.<wbr>am</a><br>
@@ -40,6 +40,7 @@ EXTRA_DIST += \<br>
 # ------------------------------<wbr>------------------------------<wbr>----------------<br>
<br>
 TEST_LIBS = \<br>
+Â Â Â Â $(top_builddir)/src/gtest/<a href="http://libgtest.la" rel="noreferrer" target="_blank">libg<wbr>test.la</a> \<br>
    compiler/<a href="http://libintel_compiler.la" rel="noreferrer" target="_blank">libintel_compiler.la</a> \<br>
    common/<a href="http://libintel_common.la" rel="noreferrer" target="_blank">libintel_common.la</a> \<br>
    $(top_builddir)/src/compiler/<wbr>nir/<a href="http://libnir.la" rel="noreferrer" target="_blank">libnir.la</a> \<br>
@@ -64,53 +65,38 @@ check_PROGRAMS += $(COMPILER_TESTS)<br>
<br>
 compiler_test_fs_cmod_<wbr>propagation_SOURCES = \<br>
    compiler/test_fs_cmod_<wbr>propagation.cpp<br>
-compiler_test_fs_cmod_<wbr>propagation_LDADD = \<br>
-Â Â Â Â $(top_builddir)/src/gtest/<a href="http://libgtest.la" rel="noreferrer" target="_blank">libg<wbr>test.la</a> \<br>
-Â Â Â Â $(TEST_LIBS)<br>
+compiler_test_fs_cmod_<wbr>propagation_LDADD = $(TEST_LIBS)<br>
<br>
 compiler_test_fs_copy_<wbr>propagation_SOURCES = \<br>
    compiler/test_fs_copy_<wbr>propagation.cpp<br>
-compiler_test_fs_copy_<wbr>propagation_LDADD = \<br>
-Â Â Â Â $(top_builddir)/src/gtest/<a href="http://libgtest.la" rel="noreferrer" target="_blank">libg<wbr>test.la</a> \<br>
-Â Â Â Â $(TEST_LIBS)<br>
+compiler_test_fs_copy_<wbr>propagation_LDADD = $(TEST_LIBS)<br>
<br>
 compiler_test_fs_saturate_<wbr>propagation_SOURCES = \<br>
    compiler/test_fs_saturate_<wbr>propagation.cpp<br>
-compiler_test_fs_saturate_<wbr>propagation_LDADD = \<br>
-Â Â Â Â $(top_builddir)/src/gtest/<a href="http://libgtest.la" rel="noreferrer" target="_blank">libg<wbr>test.la</a> \<br>
-Â Â Â Â $(TEST_LIBS)<br>
+compiler_test_fs_saturate_<wbr>propagation_LDADD = $(TEST_LIBS)<br>
<br>
 compiler_test_vf_float_<wbr>conversions_SOURCES = \<br>
    compiler/test_vf_float_<wbr>conversions.cpp<br>
-compiler_test_vf_float_<wbr>conversions_LDADD = \<br>
-Â Â Â Â $(top_builddir)/src/gtest/<a href="http://libgtest.la" rel="noreferrer" target="_blank">libg<wbr>test.la</a> \<br>
-Â Â Â Â $(TEST_LIBS)<br>
+compiler_test_vf_float_<wbr>conversions_LDADD = $(TEST_LIBS)<br>
<br>
 compiler_test_vec4_register_<wbr>coalesce_SOURCES = \<br>
    compiler/test_vec4_register_<wbr>coalesce.cpp<br>
-compiler_test_vec4_register_<wbr>coalesce_LDADD = \<br>
-Â Â Â Â $(top_builddir)/src/gtest/<a href="http://libgtest.la" rel="noreferrer" target="_blank">libg<wbr>test.la</a> \<br>
-Â Â Â Â $(TEST_LIBS)<br>
+compiler_test_vec4_register_<wbr>coalesce_LDADD = $(TEST_LIBS)<br>
<br>
 compiler_test_vec4_copy_<wbr>propagation_SOURCES = \<br>
    compiler/test_vec4_copy_<wbr>propagation.cpp<br>
-compiler_test_vec4_copy_<wbr>propagation_LDADD = \<br>
-Â Â Â Â $(top_builddir)/src/gtest/<a href="http://libgtest.la" rel="noreferrer" target="_blank">libg<wbr>test.la</a> \<br>
-Â Â Â Â $(TEST_LIBS)<br>
+compiler_test_vec4_copy_<wbr>propagation_LDADD = $(TEST_LIBS)<br>
<br>
 compiler_test_vec4_cmod_<wbr>propagation_SOURCES = \<br>
    compiler/test_vec4_cmod_<wbr>propagation.cpp<br>
-compiler_test_vec4_cmod_<wbr>propagation_LDADD = \<br>
-Â Â Â Â $(top_builddir)/src/gtest/<a href="http://libgtest.la" rel="noreferrer" target="_blank">libg<wbr>test.la</a> \<br>
-Â Â Â Â $(TEST_LIBS)<br>
+compiler_test_vec4_cmod_<wbr>propagation_LDADD = $(TEST_LIBS)<br>
<br>
+# Strictly speaking this is neither a C++ test nor using gtest - we can address<br>
+# address that at a later point. Until then, this allows us a to simplify things.<br>
 compiler_test_eu_compact_<wbr>SOURCES = \<br>
-Â Â Â Â compiler/test_eu_compact.c<br>
-nodist_EXTRA_compiler_test_<wbr>eu_compact_SOURCES = dummy.cpp<br>
+Â Â Â Â compiler/test_eu_compact.cpp<br>
 compiler_test_eu_compact_LDADD = $(TEST_LIBS)<br>
<br>
 compiler_test_eu_validate_<wbr>SOURCES = \<br>
    compiler/test_eu_validate.cpp<br>
-compiler_test_eu_validate_<wbr>LDADD = \<br>
-Â Â Â Â $(top_builddir)/src/gtest/<a href="http://libgtest.la" rel="noreferrer" target="_blank">libg<wbr>test.la</a> \<br>
-Â Â Â Â $(TEST_LIBS)<br>
+compiler_test_eu_validate_<wbr>LDADD = $(TEST_LIBS)<br>
diff --git a/src/intel/compiler/test_eu_<wbr>compact.c b/src/intel/compiler/test_eu_<wbr>compact.cpp<br>
similarity index 98%<br>
rename from src/intel/compiler/test_eu_<wbr>compact.c<br>
rename to src/intel/compiler/test_eu_<wbr>compact.cpp<br>
index d7453613b6..d1f6822f94 100644<br>
--- a/src/intel/compiler/test_eu_<wbr>compact.c<br>
+++ b/src/intel/compiler/test_eu_<wbr>compact.cpp<br>
@@ -287,7 +287,7 @@ run_tests(const struct gen_device_info *devinfo)<br>
 int<br>
 main(int argc, char **argv)<br>
 {<br>
-Â Â struct gen_device_info *devinfo = calloc(1, sizeof(*devinfo));<br>
+Â Â struct gen_device_info *devinfo = (struct gen_device_info *)calloc(1, sizeof(*devinfo));<br>
  devinfo->gen = 6;<br>
  bool fail = false;<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
2.11.1<br>
<br>
______________________________<wbr>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div></div>