http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88695
Revision: 88695
Author: krinkle
Date: 2011-05-23 22:33:36 +0000 (Mon, 23 May 2011)
Log Message:
-----------
Synchronize TestSwarm script. Looks like the previous version ignored the svn
HEAD in /resources and only updated on a commit in /tests/qunit. Fixed now.
Modified Paths:
--------------
trunk/tools/testswarm/scripts/testswarm-mediawiki-svn.php
Modified: trunk/tools/testswarm/scripts/testswarm-mediawiki-svn.php
===================================================================
--- trunk/tools/testswarm/scripts/testswarm-mediawiki-svn.php 2011-05-23
22:29:54 UTC (rev 88694)
+++ trunk/tools/testswarm/scripts/testswarm-mediawiki-svn.php 2011-05-23
22:33:36 UTC (rev 88695)
@@ -118,7 +118,6 @@
*/
# Get latest revision number of HEAD for QUnit tests dir and Resources dir
-$tmpCmd = array();
$svnHeadRevs = array(
'tests' => null,
'resources' => null,
@@ -128,23 +127,28 @@
foreach ( array(
'tests' => $svnCoRepoInfo['rootBase'] . '/' .
$svnCoRepoInfo['qunitDir'],
'resources' => $svnCoRepoInfo['rootBase'] . '/' .
$svnCoRepoInfo['resourcesDir'],
-) as $key => $url ) {
+) as $dirKey => $dirUrl ) {
- exec( "svn info $url", $tmpCmd['output'], $tmpCmd['return'] );
+ $tmpCmd = array();
+
+ exec( "svn info $dirUrl", $tmpCmd['output'], $tmpCmd['return'] );
if ( is_array( $tmpCmd['output'] ) && count( $tmpCmd['output'] ) ) {
- foreach( $tmpCmd['output'] as $line ) {
- $lineParts = explode( ':', $line, 2 );
+
+ foreach( $tmpCmd['output'] as $cmdLine ) {
+
+ $lineParts = explode( ':', $cmdLine, 2 );
if ( trim( $lineParts[0] ) == 'Last Changed Rev' ) {
- $svnHeadRevs[$key] = trim( $lineParts[1] );
+
+ $svnHeadRevs[$dirKey] = trim( $lineParts[1] );
break;
}
+
+ unset( $cmdLine, $lineParts );
}
- unset( $line, $lineParts );
}
-
+ unset( $tmpCmd, $key, $dirUrl );
}
-unset( $tmpCmd, $key, $url );
if ( empty( $svnHeadRevs['tests'] ) || empty( $svnHeadRevs['resources'] ) ) {
die("Problem getting svn info.");
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
