diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-06-28 13:41:18 -0700 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-06-28 13:41:18 -0700 |
| commit | c2ac0fb4dfe9c31b14ab56798f8c1edbae62c994 (patch) | |
| tree | d360d03955e607cf67e69ca2968fb3851b373ba0 /tests | |
| parent | 67ed48d4c93b661942aa3a1f8269e7839896d06c (diff) | |
| parent | 7f3ddd43411c9b5b1b26d42751a6dbe416ab5499 (diff) | |
| download | nextcloud-server-c2ac0fb4dfe9c31b14ab56798f8c1edbae62c994.tar.gz nextcloud-server-c2ac0fb4dfe9c31b14ab56798f8c1edbae62c994.zip | |
Merge pull request #3881 from owncloud/archive_tar_php5.5
Skip Test_Archive_TAR in php 5.5 for now
Diffstat (limited to 'tests')
| -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'); |