diff options
| author | Eric Wong <normalperson@yhbt.net> | 2010-06-04 01:25:29 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2010-06-04 01:36:30 +0000 |
| commit | f66c59d7b259e5784c9da87df1a6f1dbca160577 (patch) | |
| tree | 50009f915932d0b423b114348095953a6f1257d0 /t/GNUmakefile | |
| parent | e7690caedf80a1af2b6145d1b8f108ea42ee9a29 (diff) | |
| download | rainbows-f66c59d7b259e5784c9da87df1a6f1dbca160577.tar.gz | |
We don't need tmp/ in our top level directory
Diffstat (limited to 't/GNUmakefile')
| -rw-r--r-- | t/GNUmakefile | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/t/GNUmakefile b/t/GNUmakefile index 81484a7..955f273 100644 --- a/t/GNUmakefile +++ b/t/GNUmakefile @@ -15,12 +15,7 @@ ifeq ($(RUBY_VERSION),) $(error unable to detect RUBY_VERSION) endif -ifeq ($(RUBYLIB),) - RUBYLIB := $(rainbows_lib) -else - RUBYLIB := $(rainbows_lib):$(RUBYLIB) -endif -export RUBYLIB RUBY_VERSION +export RUBY_VERSION models += WriterThreadPool models += WriterThreadSpawn @@ -99,16 +94,21 @@ $(deps): @test -s $@.$(pid) || \ { echo >&2 "E '$(dep_bin)' not found in PATH=$(PATH)"; exit 1; } @mv $@.$(pid) $@ -dep: $(deps) - $(MAKE) -C .. isolate + +libs := tmp/isolate/ruby-$(RUBY_VERSION)/.libs +$(libs): test_isolate.rb + mkdir -p $(@D) + $(RUBY) $< > $@+ + mv $@+ $@ +$(T): $(libs) $(deps) test-bin-$(RUBY_VERSION)/rainbows trash/.gitignore $(MODEL_T): export model = $(firstword $(subst ., ,$@)) $(MODEL_T): script = $(subst $(model).,,$@) -$(MODEL_T): trash/.gitignore $(MODEL_T): export RUBY := $(RUBY) $(MODEL_T): export PATH := $(CURDIR)/test-bin-$(RUBY_VERSION):$(PATH) -$(MODEL_T): test-bin-$(RUBY_VERSION)/rainbows dep - $(TRACER) $(SHELL) $(SH_TEST_OPTS) $(script) $(TEST_OPTS) +$(MODEL_T): + RUBYLIB=$(rainbows_lib):$$(cat $(libs)) \ + $(TRACER) $(SHELL) $(SH_TEST_OPTS) $(script) $(TEST_OPTS) trash/.gitignore: mkdir -p $(@D) |