| Index: trunk/test-server/cc-home/projects/mw/config.xml |
| — | — | @@ -1,5 +1,5 @@ |
| 2 | 2 | <?xml version="1.0" encoding="UTF-8"?> |
| 3 | | -<project name="phpundercontrol.org" buildafterfailed="false"> |
| | 3 | +<project name="MediaWiki (trunk)" buildafterfailed="false"> |
| 4 | 4 | <plugin name="svn" classname="net.sourceforge.cruisecontrol.sourcecontrols.SVN" /> |
| 5 | 5 | <modificationset quietperiod="60"> |
| 6 | 6 | <svn localWorkingCopy="projects/${project.name}/source/"/> |
| — | — | @@ -14,4 +14,4 @@ |
| 15 | 15 | <log dir="logs/${project.name}"> |
| 16 | 16 | <merge dir="projects/${project.name}/build/logs/"/> |
| 17 | 17 | </log> |
| 18 | | -</project> |
| \ No newline at end of file |
| | 18 | +</project> |
| Index: trunk/test-server/cc-home/projects/mw/ExtraSettings.php |
| — | — | @@ -5,9 +5,15 @@ |
| 6 | 6 | require_once( "$ext/Cite/Cite.php" ); |
| 7 | 7 | require_once( "$ext/CodeReview/CodeReview.php" ); |
| 8 | 8 | require_once( "$ext/Gadgets/Gadgets.php" ); |
| 9 | | -require_once( "$ext/FlaggedRevs/FlaggedRevs.php" ); |
| | 9 | +#require_once( "$ext/FlaggedRevs/FlaggedRevs.php" ); |
| 10 | 10 | require_once( "$ext/LabeledSectionTransclusion/lst.php" ); |
| 11 | 11 | require_once( "$ext/ParserFunctions/ParserFunctions.php" ); |
| 12 | 12 | require_once( "$ext/Poem/Poem.php" ); |
| 13 | 13 | |
| 14 | 14 | $wgPFEnableStringFunctions = true; # fully test ParserFunctions |
| | 15 | + |
| | 16 | +$wgShowExceptionDetails = true; |
| | 17 | +$wgShowSQLErrors = true; |
| | 18 | +#$wgDebugLogFile = dirname( __FILE__ ) . '/build/debug.log'; |
| | 19 | +$wgDebugDumpSql = true; |
| | 20 | + |
| Index: trunk/test-server/cc-home/projects/mw/build.properties |
| — | — | @@ -2,6 +2,7 @@ |
| 3 | 3 | sourcedir=${basedir}/source |
| 4 | 4 | extensionsdir=${basedir}/extensions |
| 5 | 5 | apache.root=/var/www/irc |
| | 6 | +svn.up.args=--ignore-externals |
| 6 | 7 | |
| 7 | 8 | # This is the part of the source checkout we're going to do things like PHPDoc, etc |
| 8 | 9 | sourcepart=. |
| Index: trunk/test-server/cc-home/projects/mw/irc-publisher.xsl |
| — | — | @@ -9,7 +9,7 @@ |
| 10 | 10 | method="text" |
| 11 | 11 | encoding="UTF-8" /> |
| 12 | 12 | |
| 13 | | - <xsl:template match="/cruisecontrol/build[@error]">Something broke. See <http://ci.tesla.usability.wikimedia.org/cruisecontrol/buildresults/mw>. |
| | 13 | + <xsl:template match="/cruisecontrol/build[@error]">Something broke. See <http://ci.tesla.usability.wikimedia.org/cruisecontrol/>. |
| 14 | 14 | <xsl:call-template name="get-last-modified"/> |
| 15 | 15 | </xsl:template> |
| 16 | 16 | |
| — | — | @@ -46,4 +46,4 @@ |
| 47 | 47 | |
| 48 | 48 | <xsl:template match="text()"/> |
| 49 | 49 | |
| 50 | | -</xsl:stylesheet> |
| \ No newline at end of file |
| | 50 | +</xsl:stylesheet> |
| Index: trunk/test-server/cc-home/projects/mw/build.xml |
| — | — | @@ -1,6 +1,6 @@ |
| 2 | 2 | <?xml version="1.0" encoding="UTF-8"?> |
| 3 | | -<project name="phpundercontrol.org" default="build" basedir="."> |
| 4 | | - <target name="build" depends="uptodate,init,phpunit" /> |
| | 3 | +<project name="MediaWiki" default="build" basedir="."> |
| | 4 | + <target name="build" depends="uptodate,init,phpunit,irc-publish" /> |
| 5 | 5 | <property file="build.properties"/> |
| 6 | 6 | |
| 7 | 7 | <!-- |
| — | — | @@ -37,6 +37,7 @@ |
| 38 | 38 | dest="${builddir}/data/phpuc.zip" |
| 39 | 39 | verbose="on"/> |
| 40 | 40 | </target> |
| | 41 | + |
| 41 | 42 | <available file="${builddir}/data/phpdoc" property="phpdoc.exists"/> |
| 42 | 43 | <target name="phpdoctemplates" unless="phpdoc.exists" depends="fetchphpuc"> |
| 43 | 44 | <unzip src="${builddir}/data/phpuc.zip" |
| — | — | @@ -58,7 +59,7 @@ |
| 59 | 60 | <mkdir dir="${builddir}/logs" /> |
| 60 | 61 | <mkdir dir="${builddir}/php-code-browser" /> |
| 61 | 62 | <exec executable="php" dir="${sourcedir}/" failonerror="true"> |
| 62 | | - <arg line="maintenance/install.php --dbtype=sqlite --dbpath=${builddir}/data --pass=testpass test test"/> |
| | 63 | + <arg line="maintenance/install.php --dbtype=sqlite --dbpath=${builddir}/data --pass=testpass --showexceptions=true test test"/> |
| 63 | 64 | </exec> |
| 64 | 65 | <exec executable="sh" dir="${sourcedir}/" failonerror="true"> |
| 65 | 66 | <arg line="-c "echo require_once\( dirname\( dirname\( __FILE__ \) \) \) . \'/ExtraSettings.php\'\;>>LocalSettings.php""/> |
| — | — | @@ -89,10 +90,10 @@ |
| 90 | 91 | |
| 91 | 92 | <target name="uptodate" depends="checkout,checkout-ext"> |
| 92 | 93 | <exec executable="svn" dir="${sourcedir}"> |
| 93 | | - <arg line="up" /> |
| | 94 | + <arg line="up $(svn.up.args} ${sourcedir}" /> |
| 94 | 95 | </exec> |
| 95 | 96 | <exec executable="svn" dir="${extensionsdir}"> |
| 96 | | - <arg line="up" /> |
| | 97 | + <arg line="up ${svn.up.args} ${extensionsdir}" /> |
| 97 | 98 | </exec> |
| 98 | 99 | </target> |
| 99 | 100 | |
| — | — | @@ -115,12 +116,14 @@ |
| 116 | 117 | |
| 117 | 118 | <target name="phpmd"> |
| 118 | 119 | <exec executable="phpmd" dir="${sourcedir}" output="${builddir}/logs/phpmd.xml"> |
| 119 | | - <arg line="${sourcepart} xml codesize,unusedcode,naming"/> |
| | 120 | + <!-- <arg line="${sourcepart} xml codesize,unusedcode,naming"/> --> |
| | 121 | + <arg line="${sourcedir}/includes/ xml codesize"/> |
| 120 | 122 | </exec> |
| 121 | 123 | </target> |
| 122 | 124 | |
| 123 | 125 | <!-- |
| 124 | 126 | Checks several software metrics for the project source |
| | 127 | + 20110529: hashar: sourcepart -> sourcedir (we only take care of core) |
| 125 | 128 | --> |
| 126 | 129 | <target name="pdepend" depends="init"> |
| 127 | 130 | <exec executable="pdepend" dir="${sourcedir}" failonerror="false"> |
| — | — | @@ -129,13 +132,21 @@ |
| 130 | 133 | --jdepend-chart=${builddir}/charts/jdepend.svg |
| 131 | 134 | --overview-pyramid=${builddir}/charts/overview-pyramid.svg |
| 132 | 135 | --coderank-mode=inheritance,property,method |
| 133 | | - ${sourcepart}" /> |
| | 136 | + ${sourcedir}" /> |
| 134 | 137 | </exec> |
| 135 | 138 | </target> |
| 136 | 139 | |
| 137 | 140 | <target name="phpunit" depends="prepare"> |
| 138 | | - <exec executable="./phpunit.php" dir="${sourcedir}/maintenance/tests/phpunit" failonerror="true"> |
| 139 | | - <arg line="--configuration suite.xml --log-junit ${builddir}/logs/junit.xml --coverage-clover ${builddir}/logs/phpunit.coverage.xml --coverage-html ${builddir}/coverage" /> |
| | 141 | + <exec executable="./phpunit.php" dir="${sourcedir}/tests/phpunit" failonerror="true"> |
| | 142 | + <!-- |
| | 143 | + 20110519 hashar: uses 'tap', disable group 'Database', remove coverage |
| | 144 | + 20110521 hashar: stop using 'tap' |
| | 145 | + 20110528 hashar: enable 'Database' group |
| | 146 | + --> |
| | 147 | +<!-- 20110519: backed out line |
| | 148 | + <arg line="==configuration suite.xml ==tap ==exclude-group Broken,Destructive,Database,Stub ==log-junit ${builddir}/logs/junit.xml ==coverage-clover ${builddir}/logs/phpunit.coverage.xml ==coverage-html ${builddir}/coverage" /> |
| | 149 | +--> |
| | 150 | + <arg line="--configuration suite.xml --exclude-group Broken,Stub --log-junit ${builddir}/logs/junit.xml" /> |
| 140 | 151 | </exec> |
| 141 | 152 | </target> |
| 142 | 153 | |
| — | — | @@ -145,6 +156,7 @@ |
| 146 | 157 | </exec> |
| 147 | 158 | </target> |
| 148 | 159 | |
| | 160 | + <!-- Get commiters userinfos from svn --> |
| 149 | 161 | <available file="${builddir}/data/userinfo" property="userinfo.exists"/> |
| 150 | 162 | <target name="userinfo" unless="userinfo.exists"> |
| 151 | 163 | <exec executable="svn"> |
| — | — | @@ -152,6 +164,7 @@ |
| 153 | 165 | </exec> |
| 154 | 166 | </target> |
| 155 | 167 | |
| | 168 | + <!-- Converts userinfo to XML format --> |
| 156 | 169 | <target name="userinfo-up" depends="userinfo"> |
| 157 | 170 | <exec executable="svn" dir="${builddir}/data/userinfo"> |
| 158 | 171 | <arg line="up"/> |
| — | — | @@ -161,7 +174,9 @@ |
| 162 | 175 | </exec> |
| 163 | 176 | </target> |
| 164 | 177 | |
| 165 | | - <target name="irc-publish" unless="${thisbuildsuccessful}" depends="userinfo-up"> |
| | 178 | + <!-- Generates build results for IRC notifications --> |
| | 179 | + <available file="${logdir}/${logfile}" property="logfile.exists"/> |
| | 180 | + <target name="irc-publish" unless="${thisbuildsuccessful}" if="logfile.exists" depends="userinfo-up"> |
| 166 | 181 | <!-- $logfile is the file --> |
| 167 | 182 | |
| 168 | 183 | <xslt in="${logdir}/${logfile}" out="${apache.root}/irc-publish.txt" |