Merge remote-tracking branch 'origin/master'

jruby · Feb 24, 2015 · c149655 · c149655
2 parents 1345982 + 66f549a
commit c149655
Show file tree

Hide file tree

Showing 6 changed files with 1,079 additions and 22 deletions.
diff --git a/spec/truffle/buildTestReports.xml b/spec/truffle/buildTestReports.xml
@@ -5,20 +5,20 @@
  ~
  ~ Run from JRuby root directory as: ant -buildfile spec/truffle/buildTestReports.xml
 -->
-<project name="genTestReport" default="gen" basedir="../../">
+<project name="genTestReport" default="gen" basedir="../../test">
     <description>
         Generate an HTML report from jUnit XML files.
     </description>
 
     <target name="gen">
-        <property name="genReportDir" location="tmp/unitTestReports"/>
+        <property name="genReportDir" location="target/mspec-html-report"/>
         <delete dir="${genReportDir}"/>
         <mkdir dir="${genReportDir}"/>
-        <junitreport todir="tmp/unitTestReports">
-            <fileset dir="tmp">
+        <junitreport todir="${genReportDir}">
+            <fileset dir="target/mspec-results">
                 <include name="**/TEST-*.xml"/>
             </fileset>
-            <report format="frames" todir="${genReportDir}/html"/>
+            <report format="frames" styledir="${basedir}/../spec/truffle" todir="${genReportDir}/html"/>
         </junitreport>
     </target>
 </project>