[前][次][番号順一覧][スレッド一覧]

ruby-changes:17004

From: nobu <ko1@a...>
Date: Mon, 16 Aug 2010 12:29:25 +0900 (JST)
Subject: [ruby-changes:17004] Ruby:r29001 (trunk): * Makefile.in, win32/Makefile.sub (test-rubyspec-precheck): split

nobu	2010-08-16 12:29:08 +0900 (Mon, 16 Aug 2010)

  New Revision: 29001

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29001

  Log:
    * Makefile.in, win32/Makefile.sub (test-rubyspec-precheck): split
      from test-rubyspec.
    
    * common.mk (test-rubyspec): moved from Makefile.in.

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk
    trunk/win32/Makefile.sub

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29000)
+++ ChangeLog	(revision 29001)
@@ -1,3 +1,10 @@
+Mon Aug 16 12:29:06 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* Makefile.in, win32/Makefile.sub (test-rubyspec-precheck): split
+	  from test-rubyspec.
+
+	* common.mk (test-rubyspec): moved from Makefile.in.
+
 Mon Aug 16 10:00:45 2010  NAKAMURA Usaku  <usa@r...>
 
 	* ext/bigdecimal/bigdecimal.h (llabs): never never never never never
Index: common.mk
===================================================================
--- common.mk	(revision 29000)
+++ common.mk	(revision 29001)
@@ -446,6 +446,11 @@
 		-install_name=$(RUBY_INSTALL_NAME) \
 		-so_name=$(RUBY_SO_NAME) rbconfig.rb
 
+test-rubyspec-precheck:
+
+test-rubyspec: test-rubyspec-precheck
+	$(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
+
 encs: enc trans
 encs enc trans: $(ENC_MK) $(LIBRUBY) $(PREP)
 	$(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) $@
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 29000)
+++ win32/Makefile.sub	(revision 29001)
@@ -367,6 +367,12 @@
 	@cd $(srcdir:/=\) && git clone $(RUBYSPEC_GIT_URL) spec/rubyspec
 !endif
 
+test-rubyspec-precheck:
+!if !exist($(srcdir)/spec/rubyspec/.)
+	@echo No rubyspec here.  make update-rubyspec first.
+	@exit 1
+!endif
+
 $(MKFILES): $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(win_srcdir)/configure.bat $(win_srcdir)/setup.mak $(win_srcdir)/enc-setup.mak $(srcdir)/enc/Makefile.in
 	$(COMSPEC) /C $(win_srcdir:/=\)\configure.bat $(configure_args)
 	@echo $(MKFILES) should be updated, re-run $(MAKE).
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 29000)
+++ Makefile.in	(revision 29001)
@@ -313,9 +313,8 @@
 	  exec git clone $(RUBYSPEC_GIT_URL) spec/rubyspec; \
 	fi
 
-test-rubyspec:
+test-rubyspec-precheck:
 	@if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here.  make update-rubyspec first.; exit 1; fi
-	$(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
 
 INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
 	  vmtc.inc vm.inc

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]