Author: djspiewak
Date: Tue Sep 8 03:06:00 2009
New Revision: 812332
URL: http://svn.apache.org/viewvc?rev=812332&view=rev
Log:
Fixed failure reporting for ScalaTest (Jeremie Lenfant-Engelmann)
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/scala/tests.rb
Modified: buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=812332&r1=812331&r2=812332&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Tue Sep 8 03:06:00 2009
@@ -1,4 +1,5 @@
1.3.5 (Pending)
+* Fixed: BUILDR-307 Failures are not reported correctly for ScalaTest
(Jeremie Lenfant-Engelmann)
* Fixed: BUILDR-278 tasks/*.rake files are loaded after the buildfile (Rhett
Sutphin)
* Fixed: BUILDR-304 Referencing an existing package task using the package
method fails if the package has a custom filename (Rhett
Sutphin)
Modified: buildr/trunk/lib/buildr/scala/tests.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/tests.rb?rev=812332&r1=812331&r2=812332&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/tests.rb (original)
+++ buildr/trunk/lib/buildr/scala/tests.rb Tue Sep 8 03:06:00 2009
@@ -126,9 +126,9 @@
while (!completed) do
File.open(reportFile, "r") do |input|
while (line = input.gets) do
- failed = (line =~ /(TEST FAILED -)|(RUN STOPPED)|(RUN ABORTED)/)
unless failed
+ failed = (line =~ /(TESTS? FAILED -)|(RUN STOPPED)|(RUN
ABORTED)/) unless failed
completed |= (line =~ /Run completed\./)
- break if (failed || completed)
+ break if (failed)
end
end
wait += 1
