summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2010-06-14 08:16:38 +0000
committerEric Wong <normalperson@yhbt.net>2010-06-14 08:16:38 +0000
commitdbcbbe566b6745e6ff8b1a56218bdc0999810902 (patch)
treebf967811a5b7c62c1714795dad84dd66e8b6a2ca
parent075f83bf7929daa152dc1c12e2c53b8c61cc15c0 (diff)
p114 probably had the most deployments of the 1.8.6 series,
and I encountered problems with p399 that don't seem to be
triggered with any other Rubies.  1.8.6 is mostly a lost
cause, but we shall avoid the rb_str_set_len() regression.
-rw-r--r--local.mk.sample14
1 files changed, 12 insertions, 2 deletions
diff --git a/local.mk.sample b/local.mk.sample
index 8dc68d3..c950d87 100644
--- a/local.mk.sample
+++ b/local.mk.sample
@@ -9,10 +9,18 @@ DLEXT := so
 # Avoid loading rubygems to speed up tests because gmake is
 # fork+exec heavy with Ruby.
 prefix = $(HOME)
+
+# XXX clean this up
 ifeq ($(r192),)
   ifeq ($(r19),)
     ifeq ($(rbx),)
-      RUBY := $(prefix)/bin/ruby
+      ifeq ($(r186),)
+        RUBY := $(prefix)/bin/ruby
+      else
+        prefix := $(prefix)/r186-p114
+        export PATH := $(prefix)/bin:$(PATH)
+        RUBY := $(prefix)/bin/ruby
+      endif
     else
       prefix := $(prefix)/rbx
       export PATH := $(prefix)/bin:$(PATH)
@@ -42,7 +50,7 @@ endif
 # SHELL := /bin/bash -e -o pipefail
 SHELL := /bin/ksh93 -e -o pipefail
 
-full-test: test-18 test-191 test-192 test-rbx
+full-test: test-18 test-191 test-192 test-rbx test-186
 
 # FIXME: keep eye on Rubinius activity and wait for fixes from upstream
 # so we don't need RBX_SKIP anymore
@@ -50,6 +58,8 @@ test-rbx: export RBX_SKIP := 1
 test-rbx: export RUBY := $(RUBY)
 test-rbx:
         $(MAKE) test test-integration rbx=T 2>&1 |sed -e 's!^!rbx !'
+test-186:
+        $(MAKE) test-all r186=1 2>&1 |sed 's!^!1.8.6 !'
 test-18:
         $(MAKE) test-all 2>&1 |sed 's!^!1.8 !'
 test-191: