[pkg-kolab] r1461 - pkg-kolab_testsuite

[Mathieu Parent]

Author: sathieu
Date: 2009-11-30 22:43:44 +0000 (Mon, 30 Nov 2009)
New Revision: 1461

Modified:
   pkg-kolab_testsuite/testsuite
   pkg-kolab_testsuite/testsuite.ini
Log:
adapt tests to openpkg

Modified: pkg-kolab_testsuite/testsuite
===================================================================
--- pkg-kolab_testsuite/testsuite	2009-11-30 22:23:48 UTC (rev 1460)
+++ pkg-kolab_testsuite/testsuite	2009-11-30 22:43:44 UTC (rev 1461)
@@ -941,11 +941,11 @@
 
     # raising memory limit
     remote_command($domip, 'echo memory_limit = 64M > /etc/php5/conf.d/memory_limit.ini');
-    remote_command($domip, "testsaslauthd -u manager -p '".conf('kolab_manager_password')."'", 1);
-    test_tap($domid, $domname, 'phpunit --tap '.
-        '/usr/share/php/tests/Kolab_Filter/Horde/Kolab/Filter/AllTests.php');
-    test_tap($domid, $domname, 'phpunit --tap '.
-        '/usr/share/php/tests/Kolab_FreeBusy/Horde/Kolab/FreeBusy/AllTests.php');
+    remote_command($domip, conf('usr_sbin_dir')."/testsaslauthd -u manager -p '".conf('kolab_manager_password')."'", 1);
+    test_tap($domid, $domname, conf('usr_bin_dir').'/phpunit --tap '.
+        conf('php_test_dir').'/Kolab_Filter/Horde/Kolab/Filter/AllTests.php');
+    test_tap($domid, $domname, conf('usr_bin_dir').'/phpunit --tap '.
+        conf('php_test_dir').'/Kolab_FreeBusy/Horde/Kolab/FreeBusy/AllTests.php');
 }
 
 #-------------------------------------------------------

Modified: pkg-kolab_testsuite/testsuite.ini
===================================================================
--- pkg-kolab_testsuite/testsuite.ini	2009-11-30 22:23:48 UTC (rev 1460)
+++ pkg-kolab_testsuite/testsuite.ini	2009-11-30 22:43:44 UTC (rev 1461)
@@ -23,6 +23,11 @@
 dns_domain=local.tld
 ip_offset=10
 
+;common dirs
+usr_bin_dir=/usr/bin
+usr_sbin_dir=/usr/sbin
+php_test_dir=/usr/share/php/tests
+
 ; kolab conf
 ; native|openpkg
 kolab_installation_method=native
@@ -43,6 +48,10 @@
 
 ip_offset=10
 
+usr_bin_dir=/kolab/bin
+usr_sbin_dir=/kolab/sbin
+php_test_dir=/kolab/lib/php/test
+
 kolab_installation_method=openpkg
 kolabsrv=/kolab/bin/openpkg
 kolab_bootstrap=/kolab/sbin/kolab_bootstrap