escape paths given from tasks to executables

chrisk · Mar 1, 2010 · 7ff279e · 7ff279e
1 parent fc6a79e
commit 7ff279e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bin/parallel_test b/bin/parallel_test
@@ -42,7 +42,7 @@ else
   start = Time.now
 
   tests_folder = File.join(task, options[:path_prefix].to_s)
-  tests_folder = File.join(options[:root], tests_folder) if options[:root]
+  tests_folder = File.join(options[:root], tests_folder) unless options[:root].to_s.empty?
 
   groups = klass.tests_in_groups(tests_folder, num_processes)
   num_processes = groups.size

diff --git a/tasks/parallel_specs.rake b/tasks/parallel_specs.rake
@@ -25,7 +25,7 @@ namespace :parallel do
     task type, :count, :path_prefix, :options do |t,args|
       require File.join(File.dirname(__FILE__), '..', 'lib', "parallel_tests")
       count, prefix, options = ParallelTests.parse_rake_args(args)
-      sh "#{File.join(File.dirname(__FILE__), '..', 'bin', 'parallel_test')} --type #{type} -n #{count} -p #{prefix} -r #{RAILS_ROOT} -o #{options}"
+      sh "#{File.join(File.dirname(__FILE__), '..', 'bin', 'parallel_test')} --type #{type} -n #{count} -p '#{prefix}' -r '#{RAILS_ROOT}' -o '#{options}'"
     end
   end
 end