summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-08-11 14:20:57 +0200
committerRobin Appelman <icewind@owncloud.com>2014-08-11 16:56:36 +0200
commit482bca1713ba139c7b3f71a7cc7194d358a6392c (patch)
tree370ceba89892aac443af731e8b98aa38daa936e4
parent79fa2bc391e85657e62f5b23e4acfedd5153bbc2 (diff)
downloadnextcloud-server-482bca1713ba139c7b3f71a7cc7194d358a6392c.tar.gz
nextcloud-server-482bca1713ba139c7b3f71a7cc7194d358a6392c.zip
Fix Tar support for php >=5.5
m---------3rdparty0
-rw-r--r--tests/lib/archive/tar.php6
2 files changed, 0 insertions, 6 deletions
diff --git a/3rdparty b/3rdparty
-Subproject 3f2b62ec137082cc435bd358f9632139c1039b0
+Subproject 57245d2a64c99aab8a438f909988e7a4ffef5b2
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');