From eef8d4c4332078ce28959b4afc5870c71a820fdb Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 2 Oct 2009 00:46:01 -0700 Subject: test: don't rely on .manifest for test install This lets us run tests out-of-the-box on fresh checkouts and minimizes the overhead needed for creating/updating the test installs. --- GNUmakefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 3087082..0a1a035 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -40,8 +40,8 @@ base_bins := unicorn unicorn_rails bins := $(addprefix bin/, $(base_bins)) man1_bins := $(addsuffix .1, $(base_bins)) man1_paths := $(addprefix man/man1/, $(man1_bins)) -rb_files := $(bins) $(shell find lib -type f -name '*.rb') -inst_deps := $(c_files) $(rb_files) +rb_files := $(bins) $(shell find lib ext -type f -name '*.rb') +inst_deps := $(c_files) $(rb_files) GNUmakefile test/test_helper.rb ragel: $(ext)/unicorn_http.c $(ext)/unicorn_http.c: $(rl_files) @@ -56,9 +56,9 @@ lib/unicorn_http.$(DLEXT): $(ext)/unicorn_http.$(DLEXT) install -m644 $< $@ http: lib/unicorn_http.$(DLEXT) -$(test_prefix)/.stamp: $(inst_deps) .manifest +$(test_prefix)/.stamp: $(inst_deps) mkdir -p $(test_prefix)/.ccache - tar c `cat .manifest` | (cd $(test_prefix) && tar x) + tar c $(inst_deps) | (cd $(test_prefix) && tar x) $(MAKE) -C $(test_prefix) clean $(MAKE) -C $(test_prefix) http shebang > $@ -- cgit v1.2.3-24-ge0c7