<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Tests][1100] trunk: move bootstrap.php and install.php to includes directory</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://unit-tests.trac.wordpress.org/changeset/1100">1100</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2012-10-31 17:57:58 +0000 (Wed, 31 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>move bootstrap.php and install.php to includes directory
fixes <a href="http://unit-tests.trac.wordpress.org/ticket/137">#137</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkmultisitexml">trunk/multisite.xml</a></li>
<li><a href="#trunkphpunitxml">trunk/phpunit.xml</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkincludesbootstrapphp">trunk/includes/bootstrap.php</a></li>
<li><a href="#trunkincludesinstallphp">trunk/includes/install.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkbininstallphp">trunk/bin/install.php</a></li>
<li><a href="#trunkbootstrapphp">trunk/bootstrap.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbininstallphp"></a>
<div class="delfile"><h4>Deleted: trunk/bin/install.php (1099 => 1100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bin/install.php 2012-10-31 16:51:08 UTC (rev 1099)
+++ trunk/bin/install.php 2012-10-31 17:57:58 UTC (rev 1100)
</span><span class="lines">@@ -1,69 +0,0 @@
</span><del>-<?php
-/**
- * Installs WordPress for the purpose of the unit-tests
- *
- * @todo Reuse the init/load code in init.php
- */
-error_reporting( E_ALL & ~E_DEPRECATED & ~E_STRICT );
-
-$config_file_path = $argv[1];
-$multisite = ! empty( $argv[2] );
-
-$config_dir = dirname( $config_file_path );
-
-define( 'WP_INSTALLING', true );
-require_once $config_file_path;
-require_once $config_dir . '/includes/functions.php';
-
-$_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
-$_SERVER['HTTP_HOST'] = WP_TESTS_DOMAIN;
-$PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';
-
-require_once ABSPATH . '/wp-settings.php';
-
-require_once ABSPATH . '/wp-admin/includes/upgrade.php';
-require_once ABSPATH . '/wp-includes/wp-db.php';
-
-define( 'WP_TESTS_VERSION_FILE', ABSPATH . '.wp-tests-version' );
-
-$wpdb->suppress_errors();
-$installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
-$wpdb->suppress_errors( false );
-
-$hash = get_option( 'db_version' ) . ' ' . (int) $multisite . ' ' . sha1_file( $config_file_path );
-
-if ( $installed && file_exists( WP_TESTS_VERSION_FILE ) && file_get_contents( WP_TESTS_VERSION_FILE ) == $hash )
- return;
-
-$wpdb->query( 'SET storage_engine = INNODB' );
-$wpdb->select( DB_NAME, $wpdb->dbh );
-
-echo "Installing..." . PHP_EOL;
-
-foreach ( $wpdb->tables() as $table => $prefixed_table ) {
- $wpdb->query( "DROP TABLE IF EXISTS $prefixed_table" );
-}
-
-foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table ) {
- $wpdb->query( "DROP TABLE IF EXISTS $prefixed_table" );
-
- // We need to create references to ms global tables.
- if ( $multisite )
- $wpdb->$table = $prefixed_table;
-}
-
-wp_install( WP_TESTS_TITLE, 'admin', WP_TESTS_EMAIL, true, null, 'password' );
-
-if ( $multisite ) {
- echo "Installing network..." . PHP_EOL;
-
- define( 'WP_INSTALLING_NETWORK', true );
-
- $title = WP_TESTS_TITLE . ' Network';
- $subdomain_install = false;
-
- install_network();
- populate_network( 1, WP_TESTS_DOMAIN, WP_TESTS_EMAIL, $title, '/', $subdomain_install );
-}
-
-file_put_contents( WP_TESTS_VERSION_FILE, $hash );
</del></span></pre></div>
<a id="trunkbootstrapphp"></a>
<div class="delfile"><h4>Deleted: trunk/bootstrap.php (1099 => 1100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bootstrap.php 2012-10-31 16:51:08 UTC (rev 1099)
+++ trunk/bootstrap.php 2012-10-31 17:57:58 UTC (rev 1100)
</span><span class="lines">@@ -1,128 +0,0 @@
</span><del>-<?php
-/**
- * Installs WordPress for running the tests and loads WordPress and the test libraries
- */
-
-error_reporting( E_ALL & ~E_DEPRECATED & ~E_STRICT );
-
-require_once 'PHPUnit/Autoload.php';
-
-$config_file_path = dirname( __FILE__ ) . '/wp-tests-config.php';
-
-/*
- * Globalize some WordPress variables, because PHPUnit loads this file inside a function
- * See: https://github.com/sebastianbergmann/phpunit/issues/325
- *
- * These are not needed for WordPress 3.3+, only for older versions
-*/
-global $table_prefix, $wp_embed, $wp_locale, $_wp_deprecated_widgets_callbacks, $wp_widget_factory;
-
-// These are still needed
-global $wpdb, $current_site, $current_blog, $wp_rewrite, $shortcode_tags, $wp;
-
-if ( !is_readable( $config_file_path ) ) {
- die( "ERROR: wp-tests-config.php is missing! Please use wp-tests-config-sample.php to create a config file.\n" );
-}
-require_once $config_file_path;
-
-define( 'DIR_TESTDATA', dirname( __FILE__ ) . '/data' );
-
-if ( ! defined( 'WP_TESTS_FORCE_KNOWN_BUGS' ) )
- define( 'WP_TESTS_FORCE_KNOWN_BUGS', false );
-
-// Cron tries to make an HTTP request to the blog, which always fails, because tests are run in CLI mode only
-define( 'DISABLE_WP_CRON', true );
-
-define( 'WP_MEMORY_LIMIT', -1 );
-define( 'WP_MAX_MEMORY_LIMIT', -1 );
-
-$_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
-$_SERVER['HTTP_HOST'] = WP_TESTS_DOMAIN;
-$PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';
-
-$multisite = (int) ( defined( 'WP_TESTS_MULTISITE') && WP_TESTS_MULTISITE );
-
-system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/bin/install.php' ) . ' ' . escapeshellarg( $config_file_path ) . ' ' . $multisite );
-
-if ( $multisite ) {
- echo "Running as multisite..." . PHP_EOL;
- define( 'MULTISITE', true );
- define( 'SUBDOMAIN_INSTALL', false );
- define( 'DOMAIN_CURRENT_SITE', WP_TESTS_DOMAIN );
- define( 'PATH_CURRENT_SITE', '/' );
- define( 'SITE_ID_CURRENT_SITE', 1 );
- define( 'BLOG_ID_CURRENT_SITE', 1 );
- $GLOBALS['base'] = '/';
-} else {
- echo "Running as single site... To run multisite, use -c multisite.xml" . PHP_EOL;
-}
-unset( $multisite );
-
-require dirname( __FILE__ ) . '/includes/functions.php';
-
-// Preset WordPress options defined in bootstrap file.
-// Used to activate themes, plugins, as well as other settings.
-if(isset($GLOBALS['wp_tests_options'])) {
- function wp_tests_options( $value ) {
- $key = substr( current_filter(), strlen( 'pre_option_' ) );
- return $GLOBALS['wp_tests_options'][$key];
- }
-
- foreach ( array_keys( $GLOBALS['wp_tests_options'] ) as $key ) {
- tests_add_filter( 'pre_option_'.$key, 'wp_tests_options' );
- }
-}
-
-// Load WordPress
-require_once ABSPATH . '/wp-settings.php';
-
-// Delete any default posts & related data
-_delete_all_posts();
-
-require dirname( __FILE__ ) . '/includes/testcase.php';
-require dirname( __FILE__ ) . '/includes/testcase-xmlrpc.php';
-require dirname( __FILE__ ) . '/includes/testcase-ajax.php';
-require dirname( __FILE__ ) . '/includes/exceptions.php';
-require dirname( __FILE__ ) . '/includes/utils.php';
-
-/**
- * A child class of the PHP test runner.
- *
- * Not actually used as a runner. Rather, used to access the protected
- * longOptions property, to parse the arguments passed to the script.
- *
- * If it is determined that phpunit was called with a --group that corresponds
- * to an @ticket annotation (such as `phpunit --group 12345` for bugs marked
- * as #WP12345), then it is assumed that known bugs should not be skipped.
- *
- * If WP_TESTS_FORCE_KNOWN_BUGS is already set in wp-tests-config.php, then
- * how you call phpunit has no effect.
- */
-class WP_PHPUnit_TextUI_Command extends PHPUnit_TextUI_Command {
- function __construct( $argv ) {
- $options = PHPUnit_Util_Getopt::getopt(
- $argv,
- 'd:c:hv',
- array_keys( $this->longOptions )
- );
- $ajax_message = true;
- foreach ( $options[0] as $option ) {
- switch ( $option[0] ) {
- case '--exclude-group' :
- $ajax_message = false;
- continue 2;
- case '--group' :
- $groups = explode( ',', $option[1] );
- foreach ( $groups as $group ) {
- if ( is_numeric( $group ) || preg_match( '/^(UT|Plugin)\d+$/', $group ) )
- WP_UnitTestCase::forceTicket( $group );
- }
- $ajax_message = ! in_array( 'ajax', $groups );
- continue 2;
- }
- }
- if ( $ajax_message )
- echo "Not running ajax tests... To execute these, use --group ajax." . PHP_EOL;
- }
-}
-new WP_PHPUnit_TextUI_Command( $_SERVER['argv'] );
</del></span></pre></div>
<a id="trunkincludesbootstrapphpfromrev1099trunkbootstrapphp"></a>
<div class="copfile"><h4>Copied: trunk/includes/bootstrap.php (from rev 1099, trunk/bootstrap.php) (0 => 1100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/includes/bootstrap.php (rev 0)
+++ trunk/includes/bootstrap.php 2012-10-31 17:57:58 UTC (rev 1100)
</span><span class="lines">@@ -0,0 +1,128 @@
</span><ins>+<?php
+/**
+ * Installs WordPress for running the tests and loads WordPress and the test libraries
+ */
+
+error_reporting( E_ALL & ~E_DEPRECATED & ~E_STRICT );
+
+require_once 'PHPUnit/Autoload.php';
+
+$config_file_path = dirname( __FILE__ ) . '/../wp-tests-config.php';
+
+/*
+ * Globalize some WordPress variables, because PHPUnit loads this file inside a function
+ * See: https://github.com/sebastianbergmann/phpunit/issues/325
+ *
+ * These are not needed for WordPress 3.3+, only for older versions
+*/
+global $table_prefix, $wp_embed, $wp_locale, $_wp_deprecated_widgets_callbacks, $wp_widget_factory;
+
+// These are still needed
+global $wpdb, $current_site, $current_blog, $wp_rewrite, $shortcode_tags, $wp;
+
+if ( !is_readable( $config_file_path ) ) {
+ die( "ERROR: wp-tests-config.php is missing! Please use wp-tests-config-sample.php to create a config file.\n" );
+}
+require_once $config_file_path;
+
+define( 'DIR_TESTDATA', dirname( __FILE__ ) . '/data' );
+
+if ( ! defined( 'WP_TESTS_FORCE_KNOWN_BUGS' ) )
+ define( 'WP_TESTS_FORCE_KNOWN_BUGS', false );
+
+// Cron tries to make an HTTP request to the blog, which always fails, because tests are run in CLI mode only
+define( 'DISABLE_WP_CRON', true );
+
+define( 'WP_MEMORY_LIMIT', -1 );
+define( 'WP_MAX_MEMORY_LIMIT', -1 );
+
+$_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
+$_SERVER['HTTP_HOST'] = WP_TESTS_DOMAIN;
+$PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';
+
+$multisite = (int) ( defined( 'WP_TESTS_MULTISITE') && WP_TESTS_MULTISITE );
+
+system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/install.php' ) . ' ' . escapeshellarg( $config_file_path ) . ' ' . $multisite );
+
+if ( $multisite ) {
+ echo "Running as multisite..." . PHP_EOL;
+ define( 'MULTISITE', true );
+ define( 'SUBDOMAIN_INSTALL', false );
+ define( 'DOMAIN_CURRENT_SITE', WP_TESTS_DOMAIN );
+ define( 'PATH_CURRENT_SITE', '/' );
+ define( 'SITE_ID_CURRENT_SITE', 1 );
+ define( 'BLOG_ID_CURRENT_SITE', 1 );
+ $GLOBALS['base'] = '/';
+} else {
+ echo "Running as single site... To run multisite, use -c multisite.xml" . PHP_EOL;
+}
+unset( $multisite );
+
+require dirname( __FILE__ ) . '/functions.php';
+
+// Preset WordPress options defined in bootstrap file.
+// Used to activate themes, plugins, as well as other settings.
+if(isset($GLOBALS['wp_tests_options'])) {
+ function wp_tests_options( $value ) {
+ $key = substr( current_filter(), strlen( 'pre_option_' ) );
+ return $GLOBALS['wp_tests_options'][$key];
+ }
+
+ foreach ( array_keys( $GLOBALS['wp_tests_options'] ) as $key ) {
+ tests_add_filter( 'pre_option_'.$key, 'wp_tests_options' );
+ }
+}
+
+// Load WordPress
+require_once ABSPATH . '/wp-settings.php';
+
+// Delete any default posts & related data
+_delete_all_posts();
+
+require dirname( __FILE__ ) . '/testcase.php';
+require dirname( __FILE__ ) . '/testcase-xmlrpc.php';
+require dirname( __FILE__ ) . '/testcase-ajax.php';
+require dirname( __FILE__ ) . '/exceptions.php';
+require dirname( __FILE__ ) . '/utils.php';
+
+/**
+ * A child class of the PHP test runner.
+ *
+ * Not actually used as a runner. Rather, used to access the protected
+ * longOptions property, to parse the arguments passed to the script.
+ *
+ * If it is determined that phpunit was called with a --group that corresponds
+ * to an @ticket annotation (such as `phpunit --group 12345` for bugs marked
+ * as #WP12345), then it is assumed that known bugs should not be skipped.
+ *
+ * If WP_TESTS_FORCE_KNOWN_BUGS is already set in wp-tests-config.php, then
+ * how you call phpunit has no effect.
+ */
+class WP_PHPUnit_TextUI_Command extends PHPUnit_TextUI_Command {
+ function __construct( $argv ) {
+ $options = PHPUnit_Util_Getopt::getopt(
+ $argv,
+ 'd:c:hv',
+ array_keys( $this->longOptions )
+ );
+ $ajax_message = true;
+ foreach ( $options[0] as $option ) {
+ switch ( $option[0] ) {
+ case '--exclude-group' :
+ $ajax_message = false;
+ continue 2;
+ case '--group' :
+ $groups = explode( ',', $option[1] );
+ foreach ( $groups as $group ) {
+ if ( is_numeric( $group ) || preg_match( '/^(UT|Plugin)\d+$/', $group ) )
+ WP_UnitTestCase::forceTicket( $group );
+ }
+ $ajax_message = ! in_array( 'ajax', $groups );
+ continue 2;
+ }
+ }
+ if ( $ajax_message )
+ echo "Not running ajax tests... To execute these, use --group ajax." . PHP_EOL;
+ }
+}
+new WP_PHPUnit_TextUI_Command( $_SERVER['argv'] );
</ins></span></pre></div>
<a id="trunkincludesinstallphpfromrev1099trunkbininstallphp"></a>
<div class="copfile"><h4>Copied: trunk/includes/install.php (from rev 1099, trunk/bin/install.php) (0 => 1100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/includes/install.php (rev 0)
+++ trunk/includes/install.php 2012-10-31 17:57:58 UTC (rev 1100)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+<?php
+/**
+ * Installs WordPress for the purpose of the unit-tests
+ *
+ * @todo Reuse the init/load code in init.php
+ */
+error_reporting( E_ALL & ~E_DEPRECATED & ~E_STRICT );
+
+$config_file_path = $argv[1];
+$multisite = ! empty( $argv[2] );
+
+$config_dir = dirname( $config_file_path );
+
+define( 'WP_INSTALLING', true );
+require_once $config_file_path;
+require_once $config_dir . '/includes/functions.php';
+
+$_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
+$_SERVER['HTTP_HOST'] = WP_TESTS_DOMAIN;
+$PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';
+
+require_once ABSPATH . '/wp-settings.php';
+
+require_once ABSPATH . '/wp-admin/includes/upgrade.php';
+require_once ABSPATH . '/wp-includes/wp-db.php';
+
+define( 'WP_TESTS_VERSION_FILE', ABSPATH . '.wp-tests-version' );
+
+$wpdb->suppress_errors();
+$installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
+$wpdb->suppress_errors( false );
+
+$hash = get_option( 'db_version' ) . ' ' . (int) $multisite . ' ' . sha1_file( $config_file_path );
+
+if ( $installed && file_exists( WP_TESTS_VERSION_FILE ) && file_get_contents( WP_TESTS_VERSION_FILE ) == $hash )
+ return;
+
+$wpdb->query( 'SET storage_engine = INNODB' );
+$wpdb->select( DB_NAME, $wpdb->dbh );
+
+echo "Installing..." . PHP_EOL;
+
+foreach ( $wpdb->tables() as $table => $prefixed_table ) {
+ $wpdb->query( "DROP TABLE IF EXISTS $prefixed_table" );
+}
+
+foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table ) {
+ $wpdb->query( "DROP TABLE IF EXISTS $prefixed_table" );
+
+ // We need to create references to ms global tables.
+ if ( $multisite )
+ $wpdb->$table = $prefixed_table;
+}
+
+wp_install( WP_TESTS_TITLE, 'admin', WP_TESTS_EMAIL, true, null, 'password' );
+
+if ( $multisite ) {
+ echo "Installing network..." . PHP_EOL;
+
+ define( 'WP_INSTALLING_NETWORK', true );
+
+ $title = WP_TESTS_TITLE . ' Network';
+ $subdomain_install = false;
+
+ install_network();
+ populate_network( 1, WP_TESTS_DOMAIN, WP_TESTS_EMAIL, $title, '/', $subdomain_install );
+}
+
+file_put_contents( WP_TESTS_VERSION_FILE, $hash );
</ins></span></pre></div>
<a id="trunkmultisitexml"></a>
<div class="modfile"><h4>Modified: trunk/multisite.xml (1099 => 1100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/multisite.xml 2012-10-31 16:51:08 UTC (rev 1099)
+++ trunk/multisite.xml 2012-10-31 17:57:58 UTC (rev 1100)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <phpunit
</span><del>- bootstrap="bootstrap.php"
</del><ins>+ bootstrap="includes/bootstrap.php"
</ins><span class="cx"> backupGlobals="false"
</span><span class="cx"> colors="true"
</span><span class="cx"> >
</span></span></pre></div>
<a id="trunkphpunitxml"></a>
<div class="modfile"><h4>Modified: trunk/phpunit.xml (1099 => 1100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/phpunit.xml 2012-10-31 16:51:08 UTC (rev 1099)
+++ trunk/phpunit.xml 2012-10-31 17:57:58 UTC (rev 1100)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <phpunit
</span><del>- bootstrap="bootstrap.php"
</del><ins>+ bootstrap="includes/bootstrap.php"
</ins><span class="cx"> backupGlobals="false"
</span><span class="cx"> colors="true"
</span><span class="cx"> >
</span></span></pre>
</div>
</div>
</body>
</html>