From caccc84bf1f424a8e35f11d224602327b6256ff4 Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 15 Jan 2016 11:05:51 +0000 Subject: Revert "* common.mk: test-sample was changed to test-basic." This reverts r53537. Fix chkbuild first. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- common.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'common.mk') diff --git a/common.mk b/common.mk index d6b5621588..af28defaf5 100644 --- a/common.mk +++ b/common.mk @@ -581,10 +581,10 @@ no-btest-ruby: PHONY yes-btest-ruby: prog PHONY $(Q)$(exec) $(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib $(RUN_OPTS)" -q $(OPTS) $(TESTOPTS) -test-basic: $(TEST_RUNNABLE)-test-basic -no-test-basic: PHONY -yes-test-basic: prog PHONY - $(Q)$(exec) $(RUNRUBY) "$(srcdir)/basictest/runner.rb" --run-opt=$(RUN_OPTS) $(OPTS) $(TESTOPTS) +test-sample: $(TEST_RUNNABLE)-test-sample +no-test-sample: PHONY +yes-test-sample: prog PHONY + $(Q)$(exec) $(RUNRUBY) "$(srcdir)/tool/rubytest.rb" --run-opt=$(RUN_OPTS) $(OPTS) $(TESTOPTS) test-knownbugs: test-knownbug test-knownbug: $(TEST_RUNNABLE)-test-knownbug @@ -597,7 +597,7 @@ yes-test-testframework: prog PHONY $(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) testunit minitest no-test-testframework: PHONY -test: btest-ruby test-knownbug test-basic +test: test-sample btest-ruby test-knownbug # $ make test-all TESTOPTS="--help" displays more detail # for example, make test-all TESTOPTS="-j2 -v -n test-name -- test-file-name" @@ -663,7 +663,7 @@ $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc .PHONY: clean clean-ext clean-local clean-enc clean-golf clean-rdoc clean-html clean-extout .PHONY: distclean distclean-ext distclean-local distclean-enc distclean-golf distclean-extout .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: check test test-all btest btest-ruby test-sample test-knownbug .PHONY: run runruby parse benchmark benchmark-each tbench gdb gdb-ruby .PHONY: update-mspec update-rubyspec test-rubyspec -- cgit v1.2.3