From 607e01ccec0daca891ada1a8ea2a1cea74ef45a0 Mon Sep 17 00:00:00 2001 From: Sebastiaan Stok Date: Fri, 31 Aug 2012 11:52:51 +0200 Subject: [PATCH] Fixed failing tests on none-Windows OS --- tests/ClientTest.php | 10 +++++++++- tests/InterfaceTest.php | 10 +++++++++- tests/RepositoryTest.php | 10 +++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/tests/ClientTest.php b/tests/ClientTest.php index 7dffa3d..36275f9 100644 --- a/tests/ClientTest.php +++ b/tests/ClientTest.php @@ -14,7 +14,15 @@ class ClientTest extends PHPUnit_Framework_TestCase public static function setUpBeforeClass() { - self::$tmpdir = str_replace('\\', '/', getenv('TMP') .'/gitlist_' . md5(time() . mt_rand())); + if (getenv('TMP')) { + self::$tmpdir = getenv('TMP'); + } elseif (getenv('TMPDIR')) { + self::$tmpdir = getenv('TMPDIR'); + } else { + self::$tmpdir = '/tmp'; + } + + self::$tmpdir .= '/gitlist_' . md5(time() . mt_rand()); $fs = new Filesystem(); $fs->mkdir(self::$tmpdir); diff --git a/tests/InterfaceTest.php b/tests/InterfaceTest.php index 80ac82b..63190fd 100644 --- a/tests/InterfaceTest.php +++ b/tests/InterfaceTest.php @@ -13,7 +13,15 @@ class InterfaceTest extends WebTestCase public static function setUpBeforeClass() { - self::$tmpdir = getenv('TMP').'/gitlist_' . md5(time() . mt_rand()) . '/'; + if (getenv('TMP')) { + self::$tmpdir = getenv('TMP'); + } elseif (getenv('TMPDIR')) { + self::$tmpdir = getenv('TMPDIR'); + } else { + self::$tmpdir = '/tmp'; + } + + self::$tmpdir .= '/gitlist_' . md5(time() . mt_rand()) . '/'; $fs = new Filesystem(); $fs->mkdir(self::$tmpdir); diff --git a/tests/RepositoryTest.php b/tests/RepositoryTest.php index a3786c9..fc10614 100644 --- a/tests/RepositoryTest.php +++ b/tests/RepositoryTest.php @@ -14,7 +14,15 @@ class RepositoryTest extends PHPUnit_Framework_TestCase public static function setUpBeforeClass() { - self::$tmpdir = getenv('TMP').'/gitlist_' . md5(time() . mt_rand()); + if (getenv('TMP')) { + self::$tmpdir = getenv('TMP'); + } elseif (getenv('TMPDIR')) { + self::$tmpdir = getenv('TMPDIR'); + } else { + self::$tmpdir = '/tmp'; + } + + self::$tmpdir .= '/gitlist_' . md5(time() . mt_rand()); $fs = new Filesystem(); $fs->mkdir(self::$tmpdir);