diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-22 23:08:05 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-22 23:08:05 +0000 |
| commit | 7825e8363d4b2ccad8e2d3f5eeba9e26f6656911 (patch) | |
| tree | 83cbcf419e0feeb2ab0fd063ed85e0776eb0081b /common.mk | |
| parent | 73bed0312895322e0fd18310e840356c8e6af812 (diff) | |
Postponing the Bundler merge.
I faced a big issue about Bundler with ruby core.
I have no time to resolve it issue before 2.5 final release.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 16 |
1 files changed, 0 insertions, 16 deletions
@@ -1182,21 +1182,6 @@ yes-test-bundled-gems: test-bundled-gems-run no-test-bundled-gems: test-bundled-gems-run: $(PREPARE_BUNDLED_GEMS) -test-bundler-precheck: $(arch)-fake.rb programs - -yes-test-bundler-prepare: test-bundler-precheck - $(XRUBY) -C "$(srcdir)" bin/gem install --no-ri --no-rdoc \ - --install-dir .bundle --conservative "rspec:~> 3.5" - -RSPECOPTS = --format progress -BUNDLER_SPECS = -test-bundler: $(TEST_RUNNABLE)-test-bundler -yes-test-bundler: yes-test-bundler-prepare - $(gnumake_recursive)$(Q) \ - $(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec \ - --require spec_helper $(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS) -no-test-bundler: - UNICODE_FILES = $(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \ $(UNICODE_SRC_DATA_DIR)/CompositionExclusions.txt \ $(UNICODE_SRC_DATA_DIR)/NormalizationTest.txt \ @@ -1368,7 +1353,6 @@ help: PHONY " test-all: all ruby tests [TESTOPTS=-j4 TESTS=<test files>]" \ " test-spec: run the Ruby spec suite" \ " test-rubyspec: same as test-spec" \ - " test-bundler: run the Bundler spec" \ " test-bundled-gems: run the test suite of bundled gems" \ " up: update local copy and autogenerated files" \ " benchmark: benchmark this ruby and COMPARE_RUBY." \ |