Test suite now works on HHVM on Travis-CI
This commit is contained in:
commit
c3aba6d974
|
|
@ -5,10 +5,6 @@ php:
|
|||
- 5.6
|
||||
- 5.5
|
||||
- hhvm
|
||||
matrix:
|
||||
allow_failures:
|
||||
- php: hhvm
|
||||
|
||||
before_install:
|
||||
- sudo apt-get update -qq
|
||||
- sudo apt-get install -y -qq postfix
|
||||
|
|
@ -24,7 +20,9 @@ before_script:
|
|||
- sudo cp test/fakesendmail.sh /var/qmail/bin/sendmail
|
||||
- sudo cp test/fakesendmail.sh /usr/sbin/sendmail
|
||||
- |
|
||||
if [[ $TRAVIS_PHP_VERSION != "hhv"* ]]; then
|
||||
if [[ $TRAVIS_PHP_VERSION = "hhv"* ]]; then
|
||||
echo 'sendmail_path = "/usr/sbin/sendmail -t -i "' >> /etc/hhvm/php.ini
|
||||
else
|
||||
echo 'sendmail_path = "/usr/sbin/sendmail -t -i "' > $(php --ini|grep -m 1 "ini files in:"|cut -d ":" -f 2)/sendmail.ini
|
||||
fi
|
||||
script:
|
||||
|
|
|
|||
|
|
@ -1767,7 +1767,8 @@ EOT;
|
|||
//Create a certificate signing request
|
||||
$csr = openssl_csr_new($certprops, $pk);
|
||||
//Create a self-signed cert
|
||||
$cert = openssl_csr_sign($csr, 'file://' . $cacertfile, $capk, 1);
|
||||
$cacert = file_get_contents($cacertfile);
|
||||
$cert = openssl_csr_sign($csr, $cacert, $capk, 1);
|
||||
//Save the cert
|
||||
openssl_x509_export($cert, $certout);
|
||||
file_put_contents($certfile, $certout);
|
||||
|
|
|
|||
Loading…
Reference in New Issue