diff options
| author | Eric Wong <normalperson@yhbt.net> | 2009-07-19 16:48:12 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2009-07-19 17:13:44 -0700 |
| commit | 864a25c20b1b7d785cdff20f99e4246e7a7f9a93 (patch) | |
| tree | cf455585de70a18102a66e478f5a732bef52c527 /GNUmakefile | |
| parent | 86fd8957c7799368619aa8ce054b440716494a11 (diff) | |
| download | unicorn-864a25c20b1b7d785cdff20f99e4246e7a7f9a93.tar.gz | |
test/test_helper doesn't seem to be required correctly anymore, since we know our own module/test names don't conflict, just fix RUBYLIB to include $(test_prefix) With test_util.rb, using #reopen with Tempfile objects seems prone to the objects being closed. Not completely sure what is going on but I'll just sidestep around it since I've stopped trusting Tempfile by now... (cherry picked from commit 344b85ff28e160daa6563ab7c80b733abdeb874a)
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/GNUmakefile b/GNUmakefile index 1145143..47c6b5f 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -48,7 +48,7 @@ http11: lib/unicorn/http11.$(DLEXT) $(test_prefix)/.stamp: $(inst_deps) mkdir -p $(test_prefix)/.ccache - tar c bin ext lib GNUmakefile Manifest | (cd $(test_prefix) && tar x) + tar c `cat Manifest` | (cd $(test_prefix) && tar x) $(MAKE) -C $(test_prefix) clean $(MAKE) -C $(test_prefix) http11 shebang > $@ @@ -88,14 +88,14 @@ run_test = $(quiet_pre) setsid $(ruby) -w $(arg) $(TEST_OPTS) $(quiet_post) || \ %.n: arg = $(subst .n,,$(subst --, -n ,$@)) %.n: t = $(subst .n,$(log_suffix),$@) %.n: export PATH := $(test_prefix)/bin:$(PATH) -%.n: export RUBYLIB := $(test_prefix)/lib:$(RUBYLIB) +%.n: export RUBYLIB := $(test_prefix):$(test_prefix)/lib:$(RUBYLIB) %.n: $(test_prefix)/.stamp $(run_test) $(T): arg = $@ $(T): t = $(subst .rb,$(log_suffix),$@) $(T): export PATH := $(test_prefix)/bin:$(PATH) -$(T): export RUBYLIB := $(test_prefix)/lib:$(RUBYLIB) +$(T): export RUBYLIB := $(test_prefix):$(test_prefix)/lib:$(RUBYLIB) $(T): $(test_prefix)/.stamp $(run_test) @@ -141,7 +141,7 @@ $(T_r).%.r: rv = $(subst .r,,$(subst $(T_r).,,$@)) $(T_r).%.r: extra = ' 'v$(rv) $(T_r).%.r: arg = $(T_r) $(T_r).%.r: export PATH := $(test_prefix)/bin:$(PATH) -$(T_r).%.r: export RUBYLIB := $(test_prefix)/lib:$(RUBYLIB) +$(T_r).%.r: export RUBYLIB := $(test_prefix):$(test_prefix)/lib:$(RUBYLIB) $(T_r).%.r: export UNICORN_RAILS_TEST_VERSION = $(rv) $(T_r).%.r: export RAILS_GIT_REPO = $(CURDIR)/$(rails_git) $(T_r).%.r: $(test_prefix)/.stamp $(rails_git)/info/cloned-stamp |