Fix erfurt log path to match new directory structure

- since log folder is now on the same level as library, the log path needs to be adjusted accordingly - test case adapted
AKSW · Sep 6, 2012 · 199302d · 199302d
1 parent 8db3ba4
commit 199302d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -112,22 +112,22 @@ cs-check-blame:
 
 # test stuff
 
-test-unit:
+test-unit: directories
 	@cd tests && phpunit --bootstrap Bootstrap.php unit/
 
-test-unit-cc:
+test-unit-cc: directories
 	@cd tests/unit && phpunit
 
-test-integration-virtuoso:
+test-integration-virtuoso: directories
 	@cd tests && EF_STORE_ADAPTER=virtuoso phpunit --bootstrap Bootstrap.php integration/
 
-test-integation-virtuoso-cc:
+test-integation-virtuoso-cc: directories
 	@cd tests/integration && EF_STORE_ADAPTER=virtuoso phpunit
 
-test-integration-mysql:
+test-integration-mysql: directories
 	@cd tests && EF_STORE_ADAPTER=zenddb phpunit --bootstrap Bootstrap.php integration/
 
-test-integation-mysql-cc:
+test-integation-mysql-cc: directories
 	@cd tests/integration && EF_STORE_ADAPTER=zenddb phpunit
 
 test:

diff --git a/library/Erfurt/App.php b/library/Erfurt/App.php
@@ -811,15 +811,15 @@ public function getLogDir()
         if (isset($config->log->path)) {
             $matches = array();
             if (!(preg_match('/^(\w:[\/|\\\\]|\/)/', $config->log->path, $matches) === 1)) {
-                $config->log->path = EF_BASE . $config->log->path;
+                $config->log->path = realpath(EF_BASE . '../../' . $config->log->path);
             }
 
             $config->log->path = rtrim($config->log->path, '/\\') . '/';
 
             if (is_writable($config->log->path)) {
                 return $config->log->path;
             } else {
-            	error_log('Attention : Erfurt log.path ('. $config->log->path .') not writable.');
+                error_log('Attention : Erfurt log.path ('. $config->log->path .') not writable.');
                 return false;
             }
         } else {

diff --git a/tests/unit/Erfurt/AppTest.php b/tests/unit/Erfurt/AppTest.php
@@ -366,7 +366,7 @@ public function testGetLogDir()
          $config = $app->getConfig();
 
          $config->log->path = 'logs';
-         $expectedPath = false;
+         $expectedPath = realpath(EF_BASE . '../../logs') . '/';
          $resolvedPath = $app->getLogDir();
          $this->assertEquals($expectedPath, $resolvedPath);