summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-14 12:50:43 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-14 12:50:43 +0000
commit489e2fcd78dc2716b2505095026388d4eedee8e1 (patch)
tree963f9dbfaf9174e11bb87099da701a92d174aba5
parent6e7d794ff7ebeb1461ed30524b7708596ffdd26a (diff)
downloadruby-489e2fcd78dc2716b2505095026388d4eedee8e1.tar.gz
ruby-489e2fcd78dc2716b2505095026388d4eedee8e1.tar.xz
ruby-489e2fcd78dc2716b2505095026388d4eedee8e1.zip
* common.mk (TESTS): skips minitest by default, since it interferes
with test/unit. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19783 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--common.mk1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d41296de..e0131ad24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 14 21:50:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (TESTS): skips minitest by default, since it interferes
+ with test/unit.
+
Tue Oct 14 21:36:29 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (load_conv_function51932): check
diff --git a/common.mk b/common.mk
index 807767856..84b7460ed 100644
--- a/common.mk
+++ b/common.mk
@@ -110,6 +110,7 @@ INSTALL_DATA_MODE = 0644
PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil' -- \
$(LIBRUBY_EXTS) $(LIBRUBY_SO_UPDATE)
+TESTS = -x minitest
TESTSDIR = $(srcdir)/test
TESTWORKDIR = testwork