From 58474d4bd3f47dc74ba7b1778716d8ba0d8f021c Mon Sep 17 00:00:00 2001 From: jgen Date: Mon, 17 Feb 2014 16:57:46 -0500 Subject: [PATCH] We actually need a webserver in order to use SimpleTest. --- .travis.yml | 10 +++++++++- tests/.travis_nginx.conf | 24 ++++++++++++++++++++++++ tests/simple_test.php | 20 -------------------- 3 files changed, 33 insertions(+), 21 deletions(-) create mode 100644 tests/.travis_nginx.conf delete mode 100644 tests/simple_test.php diff --git a/.travis.yml b/.travis.yml index 9802a760..5fb27b52 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,15 @@ php: # optionally specify a list of environments, for example to test different RDBMS env: - DB=mysql - - DB=pgsql +# - DB=pgsql + +before_install: + - sudo apt-get update > /dev/null + +install: + - sudo apt-get install -y --force-yes nginx php-fpm php5-mysql + - cp .travis_nginx.conf /etc/nginx/nginx.conf + /etc/init.d/nginx restart # execute any number of scripts before the test run, custom env's are available as variables before_script: diff --git a/tests/.travis_nginx.conf b/tests/.travis_nginx.conf new file mode 100644 index 00000000..cbd9782f --- /dev/null +++ b/tests/.travis_nginx.conf @@ -0,0 +1,24 @@ +worker_processes 1; + +events { + worker_connections 1024; +} + +http { + include mime.types; + default_type application/octet-stream; + + gzip on; + + server { + listen 80; + root /; + + location ~ \.php($|/) { + fastcgi_pass 127.0.0.1:9000; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_script_name; + include fastcgi_params; + } + } +} \ No newline at end of file diff --git a/tests/simple_test.php b/tests/simple_test.php deleted file mode 100644 index 65d785ba..00000000 --- a/tests/simple_test.php +++ /dev/null @@ -1,20 +0,0 @@ -options = getopt("d:u:"); - } - - function testOptions() { - print_r($this->options); - $this->assertTrue(true); - } - -}