Rename rubyspec to spec

* common.mk (*-rubyspec): rename to *-spec because rubyspec is historical name.
  of course, *-rubyspec are still available for compatibility.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58746 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 21 insertions, 15 deletions

diff --git a/common.mk b/common.mk
index 9e554753c6..e0fb75bc89 100644
--- a/common.mk
+++ b/common.mk
@@ -514,7 +514,7 @@ install-prereq: $(CLEAR_INSTALLED_LIST) yes-fake sudo-precheck PHONY
 clear-installed-list: PHONY
 	@> $(INSTALLED_LIST) set MAKE="$(MAKE)"
 
-clean: clean-ext clean-enc clean-golf clean-docs clean-extout clean-local clean-platform clean-rubyspec
+clean: clean-ext clean-enc clean-golf clean-docs clean-extout clean-local clean-platform clean-spec
 clean-local:: clean-runnable
 	$(Q)$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
 	$(Q)$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) dmyenc.$(OBJEXT) $(ARCHFILE) .*.time
@@ -535,9 +535,10 @@ clean-platform: PHONY
 clean-extout: PHONY
 	-$(Q)$(RMDIR) $(EXTOUT)/$(arch) $(EXTOUT) 2> $(NULL) || exit 0
 clean-docs: clean-rdoc clean-html clean-capi
-clean-rubyspec: PHONY
+clean-spec: PHONY
+clean-rubyspec: clean-spec
 
-distclean: distclean-ext distclean-enc distclean-golf distclean-docs distclean-extout distclean-local distclean-platform distclean-rubyspec
+distclean: distclean-ext distclean-enc distclean-golf distclean-docs distclean-extout distclean-local distclean-platform distclean-spec
 distclean-local:: clean-local
 	$(Q)$(RM) $(MKFILES) yasmdata.rb *.inc $(PRELUDES)
 	$(Q)$(RM) config.cache config.status config.status.lineno
@@ -551,7 +552,8 @@ distclean-capi: clean-capi
 distclean-docs: clean-docs
 distclean-extout: clean-extout
 distclean-platform: clean-platform
-distclean-rubyspec: clean-rubyspec
+distclean-spec: clean-spec
+distclean-rubyspec: distclean-spec
 
 realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
 realclean-local:: distclean-local
@@ -569,7 +571,8 @@ realclean-capi: distclean-capi
 realclean-docs: distclean-docs
 realclean-extout: distclean-extout
 realclean-platform: distclean-platform
-realclean-rubyspec: distclean-rubyspec
+realclean-spec: distclean-spec
+realclean-rubyspec: realclean-spec
 
 clean-ext:: ext/clean gems/clean timestamp/clean
 distclean-ext:: ext/distclean gems/distclean timestamp/distclean
@@ -620,7 +623,7 @@ clean-platform:
 	-$(Q) $(RMDIR) $(PLATFORM_DIR) 2> $(NULL) || exit 0
 
 RUBYSPEC_CAPIEXT = spec/rubyspec/optional/capi/ext
-clean-rubyspec: PHONY
+clean-spec: PHONY
 	-$(Q) $(RM) $(RUBYSPEC_CAPIEXT)/*.$(OBJEXT) $(RUBYSPEC_CAPIEXT)/*.$(DLEXT)
 	-$(Q) $(RMDIRS) $(RUBYSPEC_CAPIEXT) 2> $(NULL) || exit 0
 
@@ -706,13 +709,15 @@ $(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h
 	> rbconfig.tmp
 	$(IFCHANGE) "--timestamp=$@" rbconfig.rb rbconfig.tmp
 
-test-rubyspec-precheck: $(arch)-fake.rb
+test-rubyspec: test-spec
 
-test-rubyspec: $(TEST_RUNNABLE)-test-rubyspec
-yes-test-rubyspec: test-rubyspec-precheck
+test-spec-precheck: $(arch)-fake.rb
+
+test-spec: $(TEST_RUNNABLE)-test-spec
+yes-test-spec: test-spec-precheck
 	$(gnumake_recursive)$(Q) \
-	$(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
-no-test-rubyspec:
+	$(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT) $(SPECOPTS)
+no-test-spec:
 
 RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable
 runnable: $(RUNNABLE) prog $(srcdir)/tool/mkrunnable.rb PHONY
@@ -744,7 +749,7 @@ $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc
 .PHONY: realclean realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
 .PHONY: check test test-all btest btest-ruby test-basic test-knownbug
 .PHONY: run runruby parse benchmark benchmark-each tbench gdb gdb-ruby
-.PHONY: update-mspec update-rubyspec test-rubyspec
+.PHONY: update-mspec update-rubyspec test-rubyspec test-spec
 .PHONY: touch-unicode-files
 
 PHONY:
@@ -1233,7 +1238,7 @@ info-arch: PHONY
 change: PHONY
 	$(BASERUBY) -C "$(srcdir)" ./tool/change_maker.rb $(CHANGES) > change.log
 
-exam: check test-rubyspec
+exam: check test-spec
 
 love: sudo-precheck up all test install exam
 	@echo love is all you need
@@ -1267,10 +1272,11 @@ help: PHONY
 	"  gdb:             runs test.rb by miniruby under gdb" \
 	"  gdb-ruby:        runs test.rb by ruby under gdb" \
 	"  check:           equals make test test-all" \
-	"  exam:            equals make check test-rubyspec" \
+	"  exam:            equals make check test-spec" \
 	"  test:            ruby core tests" \
 	"  test-all:        all ruby tests [TESTOPTS=-j4 TESTS=\"<test files>\"]" \
-	"  test-rubyspec:   run the Ruby spec suite" \
+	"  test-spec:       run the Ruby spec suite" \
+	"  test-rubyspec:   same as test-spec" \
 	"  up:              update local copy and autogenerated files" \
 	"  benchmark:       benchmark this ruby and COMPARE_RUBY." \
 	"  gcbench:         gc benchmark [GCBENCH_ITEM=<item_name>]" \