badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

We can actually push the trim functions to when we create the define, less overhead.

Browse source
This commit is contained in:
jgen 2014-02-19 18:17:26 -05:00
parent 141be8768f
commit eea4d34978
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/simpletest/main.php
View file

@ -111,8 +111,8 @@ class SCoreWebTestCase extends WebTestCase {
*/ */
protected function get_page($page) { protected function get_page($page) {
// Check if we are running on the command line // Check if we are running on the command line
if(php_sapi_name() === 'cli' || $_SERVER['HTTP_HOST'] == "<cli command>") { if(php_sapi_name() == 'cli' || $_SERVER['HTTP_HOST'] == "<cli command>") {
$host = rtrim(trim(constant("_TRAVIS_WEBHOST")), "/"); $host = constant("_TRAVIS_WEBHOST");
$this->assertFalse(empty($host)); // Make sure that we know the host address. $this->assertFalse(empty($host)); // Make sure that we know the host address.
$raw = $this->get($host."/index.php?q=".str_replace("?", "&", $page)); $raw = $this->get($host."/index.php?q=".str_replace("?", "&", $page));
} }

6
tests/all_tests.php
View file

@ -17,10 +17,10 @@ error_reporting(E_ALL);
define("CLI_LOG_LEVEL", -100); // output everything. define("CLI_LOG_LEVEL", -100); // output everything.
// Get the command line option telling us where the webserver is. // Get the command line option telling us where the webserver is.
$options = getopt("h::"); $options = getopt("h:");
$host = trim($options["h"], "'\""); $host = rtrim(trim($options["h"], "/");
if (empty($host)){ $host = "http://127.0.0.1/"; } if (empty($host)){ $host = "http://127.0.0.1"; }
define("_TRAVIS_WEBHOST", $host); define("_TRAVIS_WEBHOST", $host);

6
tests/test_install.php
View file

@ -16,12 +16,12 @@ require_once('lib/simpletest/reporter.php');
error_reporting(E_ALL); error_reporting(E_ALL);
// Get the command line option telling us what database to use. // Get the command line option telling us what database to use.
$options = getopt("d:h::"); $options = getopt("d:h:");
$db = $options["d"]; $db = $options["d"];
$host = trim($options["h"], "'\""); $host = rtrim(trim($options["h"], "/");
if (empty($db)){ die("Error: need to specifiy a database for the test environment."); } if (empty($db)){ die("Error: need to specifiy a database for the test environment."); }
if (empty($host)){ $host = "http://127.0.0.1/"; } if (empty($host)){ $host = "http://127.0.0.1"; }
define("_TRAVIS_DATABASE", $db); define("_TRAVIS_DATABASE", $db);
define("_TRAVIS_WEBHOST", $host); define("_TRAVIS_WEBHOST", $host);