brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix generating the unit test wrappers when building with MingW32

Browse Source 
For some reason the unit test symbols end up in the read-only data
section when building on windows rather than the initialised data
section so they have a different letter in the list generated by nm.
They also begin with an underscore because windows likes to add
underscores to symbols for some reason. This patch changes the regular
expressions in the code to generate the wrapper list so that it
accepts either way.

Reviewed-by: Robert Bragg <robert@linux.intel.com>
(cherry picked from commit 8bbd4d49fcbaa2add5fb5d544f2c0a08e7658d36)
This commit is contained in:
Neil Roberts 2013-09-02 17:56:39 +01:00
parent 4d98bdd9e5
commit 9c2244396e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/unit/Makefile.am
View File

@ -21,7 +21,7 @@ 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"| \
grep 'D unit_test_'|sed 's/.\+ D //' > unit-tests grep '[DR] _\?unit_test_'|sed 's/.\+ [DR] _\?//' > unit-tests
@chmod +x $(top_srcdir)/tests/test-launcher.sh @chmod +x $(top_srcdir)/tests/test-launcher.sh
@( echo "/stamp-test-unit" ; \ @( echo "/stamp-test-unit" ; \
echo "/test-unit$(EXEEXT)" ; \ echo "/test-unit$(EXEEXT)" ; \