Merge pull request #11696 from nextcloud/refactor/remove-hhvm-leftovers
Remove HHVM leftovers
This commit is contained in:
commit
a4e8b4ea56
|
@ -1,3 +0,0 @@
|
||||||
#!/bin/sh -e
|
|
||||||
HERE=$(dirname "$0")
|
|
||||||
PHP_EXE=hhvm "$HERE/autotest.sh" "$@"
|
|
|
@ -22,7 +22,7 @@ BASEDIR=$PWD
|
||||||
PRIMARY_STORAGE_CONFIGS="local swift"
|
PRIMARY_STORAGE_CONFIGS="local swift"
|
||||||
DBCONFIGS="sqlite mysql mariadb pgsql oci mysqlmb4"
|
DBCONFIGS="sqlite mysql mariadb pgsql oci mysqlmb4"
|
||||||
|
|
||||||
# $PHP_EXE is run through 'which' and as such e.g. 'php' or 'hhvm' is usually
|
# $PHP_EXE is run through 'which' and as such e.g. 'php' is usually
|
||||||
# sufficient. Due to the behaviour of 'which', $PHP_EXE may also be a path
|
# sufficient. Due to the behaviour of 'which', $PHP_EXE may also be a path
|
||||||
# (absolute or not) to an executable, e.g. ./code/projects/php-src/sapi/cli/php.
|
# (absolute or not) to an executable, e.g. ./code/projects/php-src/sapi/cli/php.
|
||||||
if [ -z "$PHP_EXE" ]; then
|
if [ -z "$PHP_EXE" ]; then
|
||||||
|
|
|
@ -42,7 +42,6 @@ $expectedFiles = [
|
||||||
'AUTHORS',
|
'AUTHORS',
|
||||||
'autotest-checkers.sh',
|
'autotest-checkers.sh',
|
||||||
'autotest-external.sh',
|
'autotest-external.sh',
|
||||||
'autotest-hhvm.sh',
|
|
||||||
'autotest-js.sh',
|
'autotest-js.sh',
|
||||||
'autotest.sh',
|
'autotest.sh',
|
||||||
'bower.json',
|
'bower.json',
|
||||||
|
|
|
@ -179,7 +179,7 @@ class QuotaTest extends \Test\Files\Storage\Storage {
|
||||||
$instance = $this->getLimitedStorage(9);
|
$instance = $this->getLimitedStorage(9);
|
||||||
$stream = $instance->fopen('files/foo', 'w+');
|
$stream = $instance->fopen('files/foo', 'w+');
|
||||||
$meta = stream_get_meta_data($stream);
|
$meta = stream_get_meta_data($stream);
|
||||||
$expected_type = defined('HHVM_VERSION') ? 'File' : 'user-space';
|
$expected_type = 'user-space';
|
||||||
$this->assertEquals($expected_type, $meta['wrapper_type']);
|
$this->assertEquals($expected_type, $meta['wrapper_type']);
|
||||||
fclose($stream);
|
fclose($stream);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue