diff --git a/tests/PHPUnit/config.ini.travis.php b/tests/PHPUnit/config.ini.travis.php deleted file mode 100644 index 0261a631e2094b99a97f5a35cd7313a84c65d48f..0000000000000000000000000000000000000000 --- a/tests/PHPUnit/config.ini.travis.php +++ /dev/null @@ -1,33 +0,0 @@ -; <?php exit; ?> DO NOT REMOVE THIS LINE -; This configuration is used for automatic integration -; tests on Travis-CI. Do not use this in production. - -[database] -host = 127.0.0.1 -username = root -password = -dbname = piwik_tests -adapter = PDO\MYSQL -; no table prefix for tests on travis -tables_prefix = -;charset = utf8 - -[tests] -request_uri = "/" -port = 3000 - -[database_tests] -host = 127.0.0.1 -username = root -password = -dbname = piwik_tests -adapter = PDO\MYSQL -; no table prefix for tests on travis -tables_prefix = - -[log] -log_writers[] = file -log_level = info - -; leave this empty here -[General] diff --git a/tests/travis b/tests/travis index 2c5747dcb11a499310fdf172dd28066b8e20ed27..08fc6dfb3442c4c1e15150adf50f5bb37ed7cb8b 160000 --- a/tests/travis +++ b/tests/travis @@ -1 +1 @@ -Subproject commit 2c5747dcb11a499310fdf172dd28066b8e20ed27 +Subproject commit 08fc6dfb3442c4c1e15150adf50f5bb37ed7cb8b