diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-04 12:35:47 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-04 12:35:47 +0000 |
| commit | 53672aa9a6e543be871f256806afd9b9ad81636b (patch) | |
| tree | ba915efb11c6beca032dc0a5eb7711f2e1023881 /common.mk | |
| parent | 95d80760818e23316f7789fdaa0caa2d61eb6227 (diff) | |
gmake.mk: test order
* common.mk (test-almost): rename target to test other than
test-frameworks.
* defs/gmake.mk (test-almost): run after test-testframework.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -546,9 +546,7 @@ clean-platform: $(Q) $(RM) $(PLATFORM_D) -$(Q) $(RMDIR) $(PLATFORM_DIR) 2> $(NULL) || exit 0 -check: main test - $(MAKE) test-testframework - $(MAKE) test-all TEST_EXCLUDES="$(TEST_EXCLUDES) $(EXCLUDE_TESTFRAMEWORK)" +check: main test test-all $(ECHO) check succeeded check-ruby: test test-ruby @@ -585,15 +583,14 @@ no-test-knownbug: PHONY yes-test-knownbug: prog PHONY -$(exec) $(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(srcdir)/KNOWNBUGS.rb -test-testframework: $(TEST_RUNNABLE)-test-testframework -no-test-testframework: PHONY -yes-test-testframework: prog PHONY +test-testframework: prog PHONY $(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) testunit minitest test: test-sample btest-ruby test-knownbug test-all: $(TEST_RUNNABLE)-test-all -yes-test-all: prog PHONY +yes-test-all: prog test-testframework test-almost PHONY +test-almost: $(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(TESTS) TESTS_BUILD = mkmf no-test-all: PHONY |