[MSpec] Import the latest mspec fix which fixes the usage of -t with …

…subprocesses.
jruby · Oct 1, 2016 · f0ab78b · f0ab78b
1 parent c2a4956
commit f0ab78b
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/spec/mspec/lib/mspec/utils/script.rb b/spec/mspec/lib/mspec/utils/script.rb
@@ -212,8 +212,14 @@ def files(list)
 
   def setup_env
     ENV['MSPEC_RUNNER'] = '1'
-    ENV['RUBY_EXE'] = config[:target] if config[:target]
-    ENV['RUBY_FLAGS'] = config[:flags].join(" ") if config[:flags]
+
+    unless ENV['RUBY_EXE']
+      ENV['RUBY_EXE'] = config[:target] if config[:target]
+    end
+
+    unless ENV['RUBY_FLAGS']
+      ENV['RUBY_FLAGS'] = config[:flags].join(" ") if config[:flags]
+    end
   end
 
   # Instantiates an instance and calls the series of methods to