From 366bc6de98c1bb23a2c14d2284a7cc7888b86fd6 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 5 Dec 2008 13:33:42 +0000
Subject: [PATCH] merges r20515 from trunk into ruby_1_9_1. *
 spec/default.mspec: follows changes in rubyspec project.   inherits
 configurations from ruby.1.9.mspec.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 5 +++++
 spec/default.mspec | 9 +--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 99b4ade3f2..afb4fa7ed3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec  4 23:02:13 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* spec/default.mspec: follows changes in rubyspec project.
+	  inherits configurations from ruby.1.9.mspec.
+
 Thu Dec  4 22:13:55 2008  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* test/ruby/test_complex.rb: added some tests.
diff --git a/spec/default.mspec b/spec/default.mspec
index a018b4020c..402065b44e 100644
--- a/spec/default.mspec
+++ b/spec/default.mspec
@@ -1,12 +1,5 @@
+load File.dirname(__FILE__) + '/rubyspec/ruby.1.9.mspec'
 class MSpecScript
-  # An ordered list of the directories containing specs to run
-  # as the CI process.
-  set :ci_files, %w[
-    spec/rubyspec/1.9/core
-    spec/rubyspec/1.9/language
-    spec/rubyspec/1.9/library
-  ]
-
   builddir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
   srcdir = ENV['SRCDIR']
   srcdir ||= $1 if File.read("#{builddir}/Makefile")[/^\s*srcdir\s*=\s*(.+)/i]