From 15fe80b3bff7b0d249ee32bcbbe1dfa116d3c629 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Sat, 24 Oct 2009 20:41:15 -0700
Subject: tests: remove symlinks and small files, use Make

This will make it easier to enable and manage tests for new
concurrency models.
---
 t/GNUmakefile | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

(limited to 't/GNUmakefile')

diff --git a/t/GNUmakefile b/t/GNUmakefile
index 24ce750..0966563 100644
--- a/t/GNUmakefile
+++ b/t/GNUmakefile
@@ -16,8 +16,25 @@ else
 endif
 export RUBYLIB RUBY_VERSION
 
+models := ThreadPool ThreadSpawn Revactor Rev
+all_models := $(models) Base
+
 T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
 
+MODEL_T := $(foreach m,$(all_models),$(addprefix $(m).,$(T)))
+$(T): MODELS = $(models)
+
+# some tests can be run with all models
+t0000-simple-http.sh: MODELS = $(all_models)
+
+# this test is not compatible with non-Thread models yet
+t9000-rack-app-pool.sh: MODELS = ThreadPool ThreadSpawn
+
+# recursively run per-model tests
+# haven't figured out a good way to make make non-recursive here, yet...
+$(T):
+	$(MAKE) $(foreach m,$(MODELS),$(addprefix $(m).,$@))
+
 all:: $(T)
 
 # can't rely on "set -o pipefail" since we don't require bash or ksh93 :<
@@ -25,7 +42,6 @@ t_pfx = trash/$@-$(RUBY_VERSION)
 TEST_OPTS =
 # TRACER = strace -f -o $(t_pfx).strace -s 100000
 # TRACER = /usr/bin/time -o $(t_pfx).time
-run_test = $(TRACER) $(SHELL) $(SH_TEST_OPTS) $@ $(TEST_OPTS)
 
 ifdef V
   ifeq ($(V),2)
@@ -42,18 +58,19 @@ test-bin-$(RUBY_VERSION)/rainbows: ../bin/rainbows
 	$(RUBY) -i -p -e '$$_.gsub!(%r{^#!.*$$},"#!$(ruby_bin)")' $@+
 	mv $@+ $@
 
-req_random_blob := $(wildcard t?1??-*.sh)
 random_blob:
 	dd if=/dev/urandom bs=1M count=10 of=$@+
 	mv $@+ $@
 
-$(req_random_blob): random_blob
+$(T): random_blob
 
-$(T): trash/.gitignore
-$(T): export RUBY := $(RUBY)
-$(T): export PATH := $(CURDIR)/test-bin-$(RUBY_VERSION):$(PATH)
-$(T): test-bin-$(RUBY_VERSION)/rainbows
-	@$(run_test)
+$(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
+	$(TRACER) $(SHELL) $(SH_TEST_OPTS) $(script) $(TEST_OPTS)
 
 trash/.gitignore:
 	mkdir -p $(@D)
-- 
cgit v1.2.3-24-ge0c7