From 694e7cdb8bce9e18ca63fab78c3201232b8aab77 Mon Sep 17 00:00:00 2001
From: Brett Smith <brett@curoverse.com>
Date: Fri, 21 Mar 2014 11:12:53 -0400
Subject: [PATCH] workbench: Tweak integration test environment.

RUBYLIB and RUBYOPT seem to be necessary on the build server.
---
 apps/workbench/test/integration_helper.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb
index 5cd6f8421a..cd9fa5106a 100644
--- 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)
-- 
2.30.2