@@ -8,12 +8,11 @@ require "#{ENV['TM_BUNDLE_SUPPORT']}/phpunit.rb" test_name = TestFinder.find_last_test_before_line(ENV['TM_FILEPATH'], ENV['TM_LINE_NUMBER']) file = ENV['TM_FILENAME'] dir = PHPUnit::Processor.is_remote? ? ENV['TM_DIRECTORY'].gsub(/#{ENV['LOCAL_PATH']}/,ENV["REMOTE_PATH"]) : ENV['TM_DIRECTORY'] - +cmd = "cd #{dir}; phpunit --log-xml /tmp/#{file}.xml --filter #{test_name} #{file} > /dev/null; cat /tmp/#{file}.xml; rm /tmp/#{file}.xml" if PHPUnit::Processor.is_remote? - output = `ssh #{ENV['REMOTE_HOST']} "cd #{dir}; phpunit --log-xml /tmp/#{file}.xml --filter #{test_name} #{file} > /dev/null; cat /tmp/#{file}.xml; rm /tmp/#{file}.xml"` + output = `ssh #{ENV['REMOTE_HOST']} "#{cmd}"` else - output = `cd #{dir}; phpunit --log-xml /tmp/#{file}.xml --filter #{test_name} #{file} > /dev/null; cat /tmp/#{file}.xml; rm /tmp/#{file}.xml` + output = `#{cmd}` end - results = PHPUnit::Processor.xml(output) puts ERB.new(File.read("#{ENV['TM_BUNDLE_SUPPORT']}/results.html.erb")).result(binding) \ No newline at end of file Support/run_single_test.rb @@ -7,11 +7,11 @@ require "#{ENV['TM_BUNDLE_SUPPORT']}/phpunit.rb" file = ENV['TM_FILENAME'] dir = PHPUnit::Processor.is_remote? ? ENV['TM_DIRECTORY'].gsub(/#{ENV['LOCAL_PATH']}/,ENV["REMOTE_PATH"]) : ENV['TM_DIRECTORY'] +cmd = "cd #{dir}; phpunit --log-xml /tmp/#{file}.xml #{file} > /dev/null; cat /tmp/#{file}.xml; rm /tmp/#{file}.xml" if PHPUnit::Processor.is_remote? - output = `ssh #{ENV['REMOTE_HOST']} "cd #{dir}; phpunit --log-xml /tmp/#{file}.xml #{file} > /dev/null; cat /tmp/#{file}.xml; rm /tmp/#{file}.xml"` + output = `ssh #{ENV['REMOTE_HOST']} "#{cmd}"` else - output = `cd #{dir}; phpunit --log-xml /tmp/#{file}.xml #{file} > /dev/null; cat /tmp/#{file}.xml; rm /tmp/#{file}.xml` + output = `#{cmd}` end - results = PHPUnit::Processor.xml(output) puts ERB.new(File.read("#{ENV['TM_BUNDLE_SUPPORT']}/results.html.erb")).result(binding) \ No newline at end of file Support/run_tests.rb 40c127fa6a681c0673cc3800d435431e42322a6f Christopher Cowan ccowan@playpeace-lm.corp.yahoo.com http://github.com/meritt/phpunit-tmbundle/commit/7ba374d21c0e437d10fb4c6a154e04d1ba54e177 7ba374d21c0e437d10fb4c6a154e04d1ba54e177 2009-06-09T01:03:07-07:00 2009-06-08T23:12:10-07:00 refactoring again Signed-off-by: Alexey Simonenko <dwarfman@gmail.com> 39dbb91062571152c052433aa62ada8991d0ad15 Alexey Simonenko dwarfman@gmail.com