From a19e220a9e000b730da92b9d9b5f76e6c7cc2ee1 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Fri, 20 Feb 2009 20:54:58 -0800
Subject: GNUMakefile: revamp for parallel 1.8/1.9 runs

Add a install-test for doing a mock install with private http11
and bin/unicorn and appropriate PATH/RUBYLIB env.

Also add a normal install target so we can just type
"make install" and just be done with a regular
installation (and it'll revert files if using git).

I use the following local.mk to augment my GNUmakefile.  It
allows me to run "make -j full-test" and run both 1.8 and 1.9
tests in parallel.

--------------------------- 8< -------------------------
DLEXT := so
rack_ver := 0.9.1

ifeq ($(r19),)
  ruby := $(HOME)/bin/ruby
  RUBYLIB := $(HOME)/lib/ruby/gems/1.8/gems/rack-$(rack_ver)/lib
else
  export PATH := $(HOME)/ruby-1.9/bin:$(PATH)
  ruby := $(HOME)/ruby-1.9/bin/ruby
  RUBYLIB := $(HOME)/ruby-1.9/lib/ruby/gems/1.9.1/gems/rack-$(rack_ver)/lib
endif

SHELL := /bin/bash -e -o pipefail

full-test: test-18 test-19
test-18:
	$(MAKE) test 2>&1 | sed -u -e 's!^!1.8 !'
test-19:
	$(MAKE) test r19=1 2>&1 | sed -u -e 's!^!1.9 !'
--------------------------- 8< -------------------------
---
 test/aggregate.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/aggregate.rb b/test/aggregate.rb
index 1c2cc5c..785d638 100755
--- a/test/aggregate.rb
+++ b/test/aggregate.rb
@@ -8,6 +8,6 @@ $failures += $3.to_i
 $errors += $4.to_i
 
 END {
-  printf("\n%d tests, %d assertions, %d failures, %d errors\n",
-         $tests, $assertions, $failures, $errors)
+  printf("\n%s - %d tests, %d assertions, %d failures, %d errors\n",
+         RUBY_VERSION, $tests, $assertions, $failures, $errors)
 }
-- 
cgit v1.2.3-24-ge0c7