From 8e55e561a1bcba57bf429c9c2111ec5351fcb1b3 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 3 Jun 2010 22:53:28 +0000 Subject: move Rails 2.3.x test to Rails 2.3.8 This allows us to gets rid of the Rack 1.0.1 dependency when running Rails tests since previous versions of Rails 2.3.x needed Rack 1.0.1, where as Rails 2.2.x and below could be used with any version of Rack (under Unicorn only). --- GNUmakefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index ca25518..35df2f2 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -208,6 +208,11 @@ $(rails_git)/info/cloned-stamp: git clone --mirror -q $(rails_git_url) $(rails_git) > $@ +$(rails_git)/info/v2.3.8-stamp: $(rails_git)/info/cloned-stamp + cd $(rails_git) && git fetch + cd $(rails_git) && git rev-parse --verify refs/tags/v2.3.8 + > $@ + rails_tests := $(addsuffix .r,$(addprefix $(T_r).,$(rails_vers))) test-rails: $(rails_tests) $(T_r).%.r: t = $(addsuffix $(log_suffix),$@) @@ -218,7 +223,7 @@ $(T_r).%.r: export PATH := $(test_prefix)/bin:$(PATH) $(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 +$(T_r).%.r: $(test_prefix)/.stamp $(rails_git)/info/v2.3.8-stamp $(run_test) ifneq ($(VERSION),) -- cgit v1.2.3-24-ge0c7