summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-08-13 11:10:18 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2014-08-13 11:10:18 +0200
commitfc46fbd1541bda8eb094bd8ee64827fa1cbf1fd0 (patch)
treeb7bb4bf62625c0b0ebc3f405f08cf26ba2185c4c /tests
parent609a52ebe2e249be88e11c55ba606dce7e6bf1da (diff)
parent482bca1713ba139c7b3f71a7cc7194d358a6392c (diff)
downloadnextcloud-server-fc46fbd1541bda8eb094bd8ee64827fa1cbf1fd0.tar.gz
nextcloud-server-fc46fbd1541bda8eb094bd8ee64827fa1cbf1fd0.zip
Merge pull request #10333 from owncloud/tar-55
Fix Tar support for php >=5.5
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/archive/tar.php6
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php
index d831487b16f..e66a8740879 100644
--- a/tests/lib/archive/tar.php
+++ b/tests/lib/archive/tar.php
@@ -10,12 +10,6 @@ require_once 'archive.php';
if (!OC_Util::runningOnWindows()) {
class Test_Archive_TAR extends Test_Archive {
- public function setUp() {
- if (floatval(phpversion())>=5.5) {
- $this->markTestSkipped('php 5.5 changed unpack function.');
- return;
- }
- }
protected function getExisting() {
$dir = OC::$SERVERROOT . '/tests/data';
return new OC_Archive_TAR($dir . '/data.tar.gz');