From 174f7cd07a4ba80abd5f3179a81ee6df7d42b340 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Fri, 30 Nov 2012 09:24:03 -0500
Subject: [PATCH] Fix tests

---
 OpenSQLManager.c     | 4 ++--
 build_osx_bundle.php | 7 ++++++-
 tests/index.php      | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/OpenSQLManager.c b/OpenSQLManager.c
index bf7add3..754264c 100644
--- a/OpenSQLManager.c
+++ b/OpenSQLManager.c
@@ -20,9 +20,9 @@ int main(int argc, char *argv[])
 {	
 	PHP_EMBED_START_BLOCK(argc,argv)
 		zend_eval_string(" \
-			$name = 'wxwidgets.'.PHP_SHLIB_SUFFIX; \
-			dl($name); \
 			chdir(dirname($argv[0])); \
+			$name = './wxwidgets.'.PHP_SHLIB_SUFFIX; \
+			dl($name); \
 			require ('OpenSQLManager.php'); \
 		", NULL, "TEST" TSRMLS_CC);
 	PHP_EMBED_END_BLOCK()
diff --git a/build_osx_bundle.php b/build_osx_bundle.php
index 94b647d..e70e1c2 100644
--- a/build_osx_bundle.php
+++ b/build_osx_bundle.php
@@ -4,7 +4,7 @@
 `make release`;
 `rm OpenSQLManager.o`;
 
-
+define('EXTENSION_DIR', ini_get('extension_dir'));
 define('VERSION', '0.2.0');
 define('APP_PATH', __DIR__.'/OpenSQLManager.app');
 define('CONTENTS', APP_PATH . '/Contents');
@@ -111,6 +111,11 @@ function copy_src()
 	$dest = MAC_OS;
 	`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');
 	$src_files = array();
 	
diff --git a/tests/index.php b/tests/index.php
index 4494d4c..ead5e55 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -17,7 +17,7 @@
  * Unit test bootstrap - Using php simpletest
  */
 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/');
 
 // --------------------------------------------------------------------------