diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-02 23:07:56 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-02 23:07:56 +0000 |
| commit | 59c8d50653480bef3f24517296e6ddf937fdf6bc (patch) | |
| tree | df10aaf4f3307837fe3d1d129d66f6c0c7586bc5 /common.mk | |
| parent | 7deb37777a230837e865e0a11fb8d7c1dc6d03ce (diff) | |
Added bundler as default gems. Revisit [Feature #12733]
* bin/*, lib/bundler/*, lib/bundler.rb, spec/bundler, man/*:
Merge from latest stable branch of bundler/bundler repository and
added workaround patches. I will backport them into upstream.
* common.mk, defs/gmake.mk: Added `test-bundler` task for test suite
of bundler.
* tool/sync_default_gems.rb: Added sync task for bundler.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65509 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 16 |
1 files changed, 16 insertions, 0 deletions
@@ -1232,6 +1232,21 @@ 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-document \ + --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 \ @@ -1403,6 +1418,7 @@ 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." \ |