diff options
| author | Neil Roberts <neil@linux.intel.com> | 2013-09-02 17:56:39 +0100 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2013-09-02 18:08:13 +0100 |
| commit | 9c2244396e304974fdf92823f674856a48edfb21 (patch) | |
| tree | cd2dd7d6231629f492de31266455069e18f8eac5 | |
| parent | 4d98bdd9e5620391705eca4ae34fcde4b4ebbce3 (diff) | |
| download | cogl-9c2244396e304974fdf92823f674856a48edfb21.tar.gz | |
Fix generating the unit test wrappers when building with MingW32
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)
| -rw-r--r-- | tests/unit/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 1a7fbeff..88028b31 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -21,7 +21,7 @@ stamp-test-unit: Makefile test-unit$(EXEEXT) @mkdir -p wrappers source $(top_builddir)/cogl/libcogl.la ; \ $(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 @( echo "/stamp-test-unit" ; \ echo "/test-unit$(EXEEXT)" ; \ |