diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2013-07-10 12:41:53 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2013-07-10 12:41:53 +0200 |
| commit | a357e5b284ed5b752864e4570cb179f3f2d88229 (patch) | |
| tree | e811ea2288b5dfa069908f25f696f795a268cb53 /tests/lib/archive/tar.php | |
| parent | 832779804d36d27c47325d1dcce09e566c8cee60 (diff) | |
| parent | 5387e5c354440b264040816ea7fcaf6783a2ebdc (diff) | |
| download | nextcloud-server-a357e5b284ed5b752864e4570cb179f3f2d88229.tar.gz nextcloud-server-a357e5b284ed5b752864e4570cb179f3f2d88229.zip | |
merge conflicts ...
Diffstat (limited to 'tests/lib/archive/tar.php')
| -rw-r--r-- | tests/lib/archive/tar.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php index e66a8740879..d831487b16f 100644 --- a/tests/lib/archive/tar.php +++ b/tests/lib/archive/tar.php @@ -10,6 +10,12 @@ 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'); |