wip travis

diff --git a/.travis.yml b/.travis.yml
index 2f500cb..d0a2fbe 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ before_install:
   - sudo chmod 755 ./tests/ci/setup/*.sh
   - sudo ./tests/ci/setup/setup_apache.sh
   - sudo ./tests/ci/setup/setup_privoxy.sh
-  - sudo ./tests/ci/setup/setup_php_travis.sh
+  - ./tests/ci/setup/setup_php_travis.sh
 
 install:
   - composer install

diff --git a/tests/ci/setup/setup_php.sh b/tests/ci/setup/setup_php.sh
index e4302b9..ad94b81 100644 (file)
--- a/tests/ci/setup/setup_php.sh
+++ b/tests/ci/setup/setup_php.sh
@@ -1,9 +1,10 @@
 #!/bin/sh
 
+# To be kept in sync with setup_php_travis.sh
+
 set -e
 
 configure_php_ini() {
-    # @todo make this idempotent so that it can be run multiple times in a row
     echo "cgi.fix_pathinfo = 1" >> "${1}"
     echo "always_populate_raw_post_data = -1" >> "${1}"
 

diff --git a/tests/ci/setup/setup_php_travis.sh b/tests/ci/setup/setup_php_travis.sh
index 35f1684..fd37f14 100644 (file)
--- a/tests/ci/setup/setup_php_travis.sh
+++ b/tests/ci/setup/setup_php_travis.sh
@@ -1,9 +1,10 @@
 #!/bin/sh
 
+# To be kept in sync with setup_php.sh
+
 set -e
 
 configure_php_ini() {
-    # @todo make this idempotent so that it can be run multiple times in a row
     echo "cgi.fix_pathinfo = 1" >> "${1}"
     echo "always_populate_raw_post_data = -1" >> "${1}"