summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--Makefile.in20
-rw-r--r--spec/README24
-rw-r--r--spec/default.mspec13
4 files changed, 59 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 215329f..62a5493 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Mon Aug 4 20:39:06 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * Makefile.in (update-rubyspec): renamed the rubyspec directory
+ "spec". Changed directory structure.
+
+ * Makefile.in (test-rubyspec): ditto.
+
+ * spec/README: described the structure of "spec" directory.
+
+ * spec/default.mspec: configured for Matz's Ruby Implementation.
+
Mon Aug 4 19:21:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (rb_ary_tmp_new): added.
diff --git a/Makefile.in b/Makefile.in
index f239b79..29a648c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -208,18 +208,20 @@ ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
update-rubyspec:
- if [ -d $(srcdir)/rubyspec ]; then \
- cd $(srcdir)/rubyspec/mspec; \
+ if [ -d $(srcdir)/spec/mspec ]; then \
+ cd $(srcdir)/spec/mspec; \
git pull; \
- cd ../spec/rubyspec; \
+ cd ../..; \
+ else \
+ git clone $(MSPEC_GIT_URL) $(srcdir)/spec/mspec; \
+ fi
+ if [ -d $(srcdir)/spec/rubyspec ]; then \
+ cd $(srcdir)/spec/rubyspec; \
git pull; \
else \
- mkdir $(srcdir)/rubyspec; \
- mkdir $(srcdir)/rubyspec/spec; \
- git clone $(MSPEC_GIT_URL) $(srcdir)/rubyspec/mspec; \
- git clone $(RUBYSPEC_GIT_URL) $(srcdir)/rubyspec/spec/rubyspec; \
+ git clone $(RUBYSPEC_GIT_URL) $(srcdir)/spec/rubyspec; \
fi
test-rubyspec:
- @if [ ! -d $(srcdir)/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi
- $(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec $(srcdir)/rubyspec/spec/rubyspec/$(MAJOR).$(MINOR)
+ @if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi
+ $(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec $(srcdir)/spec/rubyspec/$(MAJOR).$(MINOR)
diff --git a/spec/README b/spec/README
new file mode 100644
index 0000000..6daafe2
--- /dev/null
+++ b/spec/README
@@ -0,0 +1,24 @@
+= RubySpec
+
+RubySpec (http://rubyspec.org) provides the Ruby langauge specification in an
+executable format. The make task `update-rubyspec' retrieves the specification
+and put it into this directory.
+
+ spec
+ +-- mspec driver library for executing the specification.
+ +-- rubyspec
+ +-- 1.8
+ | +-- core
+ | +-- ...
+ |
+ +-- 1.9
+ +-- core specification for core libraries
+ | +-- array
+ | +-- bignum
+ | +-- ...
+ |
+ +-- fixtures
+ +-- language specification for Ruby language itself
+ +-- library specification for standard libraries.
+ +-- addrev
+ +-- ...
diff --git a/spec/default.mspec b/spec/default.mspec
new file mode 100644
index 0000000..b429f64
--- /dev/null
+++ b/spec/default.mspec
@@ -0,0 +1,13 @@
+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
+ ]
+
+ srcdir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+ # The default implementation to run the specs.
+ set :target, File.join(srcdir, `#{srcdir}/miniruby -I#{srcdir} -rrbconfig -e 'print Config::CONFIG["RUBY_INSTALL_NAME"]'`)
+end