isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 16:10:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix building the conformance and unit tests on mingw32

Browse Source 
The unit tests were failing to build with mingw32 because the
libtest-fixtures was being included both by libcogl and the
test-conformance and test-unit executables. That meant that the
symbols were defined twice and it wouldn't link.

The rule which depends on test-unit being built needs to be called
test-unit.exe on Windows so this patch fixes it to use the $(EXEEXT)
variable to get the right name.

Reviewed-by: Robert Bragg <robert@linux.intel.com>
(cherry picked from commit 575bac47fee0b425f4fd30761e5819443e6c045f)

Conflicts:
	tests/conform/Makefile.am
	tests/unit/Makefile.am
This commit is contained in:
Neil Roberts 2013-09-02 17:33:07 +01:00
parent 8ae53cea08
commit 4d98bdd9e5
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/conform/Makefile.am
View File

@ -143,7 +143,6 @@ test_conformance_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS)
test_conformance_LDADD = \ test_conformance_LDADD = \
$(COGL_DEP_LIBS) \ $(COGL_DEP_LIBS) \
$(top_builddir)/cogl/libcogl.la \ $(top_builddir)/cogl/libcogl.la \
$(top_builddir)/test-fixtures/libtest-fixtures.la \
$(LIBM) $(LIBM)
if !USE_GLIB if !USE_GLIB
test_conformance_LDADD += $(top_builddir)/deps/glib/libglib.la test_conformance_LDADD += $(top_builddir)/deps/glib/libglib.la

3
tests/unit/Makefile.am
View File

@ -17,7 +17,7 @@ endif
wrappers: stamp-test-unit wrappers: stamp-test-unit
@true @true
stamp-test-unit: Makefile test-unit stamp-test-unit: Makefile test-unit$(EXEEXT)
@mkdir -p wrappers @mkdir -p wrappers
source $(top_builddir)/cogl/libcogl.la ; \ source $(top_builddir)/cogl/libcogl.la ; \
$(NM) $(top_builddir)/cogl/.libs/"$$dlname"| \ $(NM) $(top_builddir)/cogl/.libs/"$$dlname"| \
@ -73,7 +73,6 @@ test_unit_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS)
test_unit_LDADD = \ test_unit_LDADD = \
$(COGL_DEP_LIBS) \ $(COGL_DEP_LIBS) \
$(top_builddir)/cogl/libcogl.la \ $(top_builddir)/cogl/libcogl.la \
$(top_builddir)/test-fixtures/libtest-fixtures.la \
$(LIBM) $(LIBM)
if !USE_GLIB if !USE_GLIB
test_unit_LDADD += $(top_builddir)/deps/glib/libglib.la test_unit_LDADD += $(top_builddir)/deps/glib/libglib.la