diff options
| author | Morgan Deters <mdeters@gmail.com> | 2011-09-24 18:04:08 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2011-09-24 18:04:08 +0000 |
| commit | b79e8b369649f053ce3a39d3d178e4e2dbcf9993 (patch) | |
| tree | 0d75973130594b7b498cee4dc60b83a267fbad2d /Makefile.builds.in | |
| parent | a63064385c56600143ac470108fe8e640a4ca3ee (diff) | |
Fix to building and linking for unit tests. (This should fix the segfaulting units in optimized-dynamic. The problem was that the code incorrectly determined the address of one of the thread-scoped global variables, and I think it's because the same library was linked twice into the unit test in two different ways, confusing the runtime support code.)
Diffstat (limited to 'Makefile.builds.in')
| -rw-r--r-- | Makefile.builds.in | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.builds.in b/Makefile.builds.in index 2eec9c777..44326f0ff 100644 --- a/Makefile.builds.in +++ b/Makefile.builds.in @@ -122,9 +122,15 @@ endif test -e lib || ln -sfv ".$(libdir)" lib test -e bin || ln -sfv ".$(bindir)" bin -check test units systemtests regress: all +# The descent into "src" with target "check" is to build check +# prerequisites (e.g. CHECK_PROGRAMS, CHECK_LTLIBRARIES, ...). +check test units: + (cd $(CURRENT_BUILD)/src && $(MAKE) check) + +(cd $(CURRENT_BUILD)/test && $(MAKE) $@) +systemtests regress: +(cd $(CURRENT_BUILD)/test && $(MAKE) $@) units%: + (cd $(CURRENT_BUILD)/src && $(MAKE) check) +(cd $(CURRENT_BUILD)/test && $(MAKE) units TEST_PREFIX=$(subst units:,,$@)) regress%: all +(cd $(CURRENT_BUILD)/test && $(MAKE) $@) |