diff --git a/.travis.yml b/.travis.yml index cf98dbe1..85c1dfc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,15 +10,11 @@ env: # - DB=pgsql before_install: - - pwd - - sudo pwd - sudo apt-get update > /dev/null install: - - pwd - - sudo pwd - - sudo chmod u+x test/setup_test_env.sh - - sudo ./test/setup_test_env.sh $TRAVIS_BUILD_DIR + - sudo chmod u+x tests/setup_test_env.sh + - sudo ./tests/setup_test_env.sh $TRAVIS_BUILD_DIR # 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 deleted file mode 100644 index cbd9782f..00000000 --- a/tests/travis_nginx.conf +++ /dev/null @@ -1,24 +0,0 @@ -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