From 6d81636901a6417e925c588d748a12634e8e5f82 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 27 Nov 2009 01:11:19 -0800 Subject: tests: fix bugs with dash in GNUmakefile One bad thing to defaulting to ksh93 for my tests during development, small cleanups while we're at it, too for extra checks --- t/GNUmakefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 't') diff --git a/t/GNUmakefile b/t/GNUmakefile index 0b56503..52f59df 100644 --- a/t/GNUmakefile +++ b/t/GNUmakefile @@ -4,13 +4,17 @@ all:: pid := $(shell echo $$PPID) -RUBY = $(ruby) +RUBY = ruby rainbows_lib := $(shell cd ../lib && pwd) -include ../local.mk ifeq ($(RUBY_VERSION),) RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION') endif +ifeq ($(RUBY_VERSION),) + $(error unable to detect RUBY_VERSION) +endif + ifeq ($(RUBYLIB),) RUBYLIB := $(rainbows_lib) else @@ -20,7 +24,7 @@ export RUBYLIB RUBY_VERSION models = ThreadPool ThreadSpawn Rev EventMachine rp := ) -ONENINE := $(shell case $(RUBY_VERSION) in 1.9.*$(rp); echo true;;esac) +ONENINE := $(shell case $(RUBY_VERSION) in 1.9.*$(rp) echo true;;esac) ifeq ($(ONENINE),true) models += Revactor models += FiberSpawn -- cgit v1.2.3-24-ge0c7