Fix tests

This commit is contained in:
Timothy Warren 2012-11-30 09:24:03 -05:00
parent ceeb5d826d
commit 174f7cd07a
3 changed files with 9 additions and 4 deletions

View File

@ -20,9 +20,9 @@ int main(int argc, char *argv[])
{ {
PHP_EMBED_START_BLOCK(argc,argv) PHP_EMBED_START_BLOCK(argc,argv)
zend_eval_string(" \ zend_eval_string(" \
$name = 'wxwidgets.'.PHP_SHLIB_SUFFIX; \
dl($name); \
chdir(dirname($argv[0])); \ chdir(dirname($argv[0])); \
$name = './wxwidgets.'.PHP_SHLIB_SUFFIX; \
dl($name); \
require ('OpenSQLManager.php'); \ require ('OpenSQLManager.php'); \
", NULL, "TEST" TSRMLS_CC); ", NULL, "TEST" TSRMLS_CC);
PHP_EMBED_END_BLOCK() PHP_EMBED_END_BLOCK()

View File

@ -4,7 +4,7 @@
`make release`; `make release`;
`rm OpenSQLManager.o`; `rm OpenSQLManager.o`;
define('EXTENSION_DIR', ini_get('extension_dir'));
define('VERSION', '0.2.0'); define('VERSION', '0.2.0');
define('APP_PATH', __DIR__.'/OpenSQLManager.app'); define('APP_PATH', __DIR__.'/OpenSQLManager.app');
define('CONTENTS', APP_PATH . '/Contents'); define('CONTENTS', APP_PATH . '/Contents');
@ -111,6 +111,11 @@ function copy_src()
$dest = MAC_OS; $dest = MAC_OS;
`mv {$src} {$dest}`; `mv {$src} {$dest}`;
// Copy the wxphp extension
$src = EXTENSION_DIR . '/wxwidgets.so';
$dest = MAC_OS;
`cp {$src} {$dest}`;
$raw_src_files = glob_recursive(SRC_DIR.'/*.php'); $raw_src_files = glob_recursive(SRC_DIR.'/*.php');
$src_files = array(); $src_files = array();

View File

@ -17,7 +17,7 @@
* Unit test bootstrap - Using php simpletest * Unit test bootstrap - Using php simpletest
*/ */
define('OSL_TEST_DIR', dirname(__FILE__).'/'); define('OSL_TEST_DIR', dirname(__FILE__).'/');
define('OSL_BASE_DIR', str_replace(basename(OSL_TEST_DIR).'/', '', OSL_TEST_DIR).'sys/'); define('OSL_BASE_DIR', str_replace(basename(OSL_TEST_DIR).'/', '', OSL_TEST_DIR).'src/sys/');
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------