diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-15 11:05:51 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-15 11:05:51 +0000 |
| commit | e0ea641755fe561680b1ef930ba2135e8dd3b4bc (patch) | |
| tree | 2ddd02b48d01f09d4968cb42aa8c4631ba6f3048 | |
| parent | 0d75b7f99e46066e74a2af062a425d1d88cddb04 (diff) | |
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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | common.mk | 12 | ||||
| -rwxr-xr-x | sample/test.rb (renamed from basictest/test.rb) | 0 | ||||
| -rwxr-xr-x | tool/rubytest.rb (renamed from basictest/runner.rb) | 4 |
4 files changed, 8 insertions, 15 deletions
@@ -4,13 +4,6 @@ Fri Jan 15 16:12:10 2016 Nobuyoshi Nakada <[email protected]> so that concatenated string would not be dedented. [ruby-core:72857] [Bug #11990] -Fri Jan 15 09:25:07 2016 SHIBATA Hiroshi <[email protected]> - - * common.mk: test-sample was changed to test-basic. - [Feature #11982][ruby-core:72823] - * basictest/runner.rb: ditto. rename from tool/rubytest.rb. - * basictest/test.rb: ditto. rename from sample/test.rb. - Thu Jan 14 20:01:00 2016 NARUSE, Yui <[email protected]> * lib/uri/generic.rb (URI::Generic#to_s): change encoding to @@ -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 diff --git a/basictest/test.rb b/sample/test.rb index b4aa12b784..b4aa12b784 100755 --- a/basictest/test.rb +++ b/sample/test.rb diff --git a/basictest/runner.rb b/tool/rubytest.rb index 2997f3af48..a06c400744 100755 --- a/basictest/runner.rb +++ b/tool/rubytest.rb @@ -17,12 +17,12 @@ $stderr.reopen($stdout) error = '' srcdir = File.expand_path('..', File.dirname(__FILE__)) -`#{ruby} #{opt} #{srcdir}/basictest/test.rb #{ARGV.join(' ')}`.each_line do |line| +`#{ruby} #{opt} #{srcdir}/sample/test.rb #{ARGV.join(' ')}`.each_line do |line| if line =~ /^end of test/ print "\ntest succeeded\n" exit true end - error << line if %r:^(basictest/test.rb|not): =~ line + error << line if %r:^(sample/test.rb|not): =~ line end puts print error |