projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3e3ef3a
)
workbench: Tweak integration test environment.
author
Brett Smith <brett@curoverse.com>
Fri, 21 Mar 2014 15:12:53 +0000
(11:12 -0400)
committer
Brett Smith <brett@curoverse.com>
Fri, 21 Mar 2014 15:12:53 +0000
(11:12 -0400)
RUBYLIB and RUBYOPT seem to be necessary on the build server.
apps/workbench/test/integration_helper.rb
patch
|
blob
|
history
diff --git
a/apps/workbench/test/integration_helper.rb
b/apps/workbench/test/integration_helper.rb
index 5cd6f8421a25ad0db5c1e8954b8f7ccf08292b3c..cd9fa5106ad4fb828b184f1b6d1fcd95a95138be 100644
(file)
--- a/
apps/workbench/test/integration_helper.rb
+++ b/
apps/workbench/test/integration_helper.rb
@@
-34,12
+34,8
@@
end
class IntegrationTestRunner < MiniTest::Unit
# Don't try to re-use the current Bundle environment when we launch the
# API server.
- @@APIENV = {
- 'BUNDLE_BIN_PATH' => nil,
- 'BUNDLE_GEMFILE' => nil,
- 'RUBYLIB' => nil,
- 'RUBYOPT' => nil,
- }
+ @@APIENV = ENV.map { |item| (item[0] =~ /^BUNDLE_/) ? [item[0], nil] : nil }.
+ compact.to_h
def _system(*cmd)
if not system(@@APIENV, *cmd)