summaryrefslogtreecommitdiff
path: root/stoc
diff options
context:
space:
mode:
authorPatrick Luby <pluby@openoffice.org>2001-02-12 02:30:53 +0000
committerPatrick Luby <pluby@openoffice.org>2001-02-12 02:30:53 +0000
commit390e9fa9e5cb66137466f17b9b72e808d555ceaa (patch)
tree7a535ba2e5b83ad521fc4aa8625caa144b1aeed6 /stoc
parent9ee09f88d779084c715b7a4235eebc02b5b43469 (diff)
Update test files for Mac OS X
Diffstat (limited to 'stoc')
-rw-r--r--stoc/test/testconv.cxx8
-rw-r--r--stoc/test/testcorefl.cxx8
-rw-r--r--stoc/test/testiadapter.cxx8
-rw-r--r--stoc/test/testintrosp.cxx12
-rw-r--r--stoc/test/testloader.cxx8
-rw-r--r--stoc/test/testproxyfac.cxx8
-rw-r--r--stoc/test/testregistry.cxx8
7 files changed, 46 insertions, 14 deletions
diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx
index a4787218f2af..32fedbcdc35f 100644
--- a/stoc/test/testconv.cxx
+++ b/stoc/test/testconv.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: testconv.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: dbo $ $Date: 2000-11-17 12:09:18 $
+ * last change: $Author: pluby $ $Date: 2001-02-12 03:30:52 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -691,7 +691,11 @@ static void test_Conversion( const Reference< XMultiServiceFactory > & xMgr )
#ifdef UNX
#define REG_PREFIX "lib"
+#ifdef MACOSX
+#define DLL_POSTFIX ".dylib.framework"
+#else
#define DLL_POSTFIX ".so"
+#endif
#else
#define REG_PREFIX ""
#define DLL_POSTFIX ".dll"
diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx
index d5d4287a2270..2138bd2576fd 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: testcorefl.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 15:29:35 $
+ * last change: $Author: pluby $ $Date: 2001-02-12 03:30:52 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -388,7 +388,11 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
#ifdef UNX
#define REG_PREFIX "lib"
+#ifdef MACOSX
+#define DLL_POSTFIX ".dylib.framework"
+#else
#define DLL_POSTFIX ".so"
+#endif
#else
#define REG_PREFIX ""
#define DLL_POSTFIX ".dll"
diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx
index 25c174fc7902..ed01ce086e1e 100644
--- a/stoc/test/testiadapter.cxx
+++ b/stoc/test/testiadapter.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: testiadapter.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: dbo $ $Date: 2000-10-06 14:25:14 $
+ * last change: $Author: pluby $ $Date: 2001-02-12 03:30:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1001,7 +1001,11 @@ static sal_Bool test_invocation( const Reference< XMultiServiceFactory > & xMgr
#ifdef UNX
#define REG_PREFIX "lib"
+#ifdef MACOSX
+#define DLL_POSTFIX ".dylib.framework"
+#else
#define DLL_POSTFIX ".so"
+#endif
#else
#define REG_PREFIX ""
#define DLL_POSTFIX ".dll"
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index 703837792cc9..2639341cabcc 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: testintrosp.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: dbo $ $Date: 2000-11-08 09:36:19 $
+ * last change: $Author: pluby $ $Date: 2001-02-12 03:30:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1598,8 +1598,12 @@ int __cdecl main( int argc, char * argv[] )
#ifdef SAL_W32
libName = OUString::createFromAscii("corefl.dll");
#else
+#ifdef MACOSX
+ libName = OUString::createFromAscii("libcorefl.dylib.framework");
+#else
libName = OUString::createFromAscii("libcorefl.so");
#endif
+#endif
// ORealDynamicLoader::computeLibraryName( OUString::createFromAscii("corefl"), libName);
xImplReg->registerImplementation(OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
libName, Reference< XSimpleRegistry >() );
@@ -1610,8 +1614,12 @@ int __cdecl main( int argc, char * argv[] )
#ifdef SAL_W32
libName = OUString::createFromAscii("insp.dll");
#else
+#ifdef MACOSX
+ libName = OUString::createFromAscii("libinsp.dylib.framework");
+#else
libName = OUString::createFromAscii("libinsp.so");
#endif
+#endif
// ORealDynamicLoader::computeLibraryName( OUString::createFromAscii("insp"), libName);
xImplReg->registerImplementation(OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
libName, Reference< XSimpleRegistry >() );
diff --git a/stoc/test/testloader.cxx b/stoc/test/testloader.cxx
index 01491a7f8e83..848a3c006d84 100644
--- a/stoc/test/testloader.cxx
+++ b/stoc/test/testloader.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: testloader.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: dbo $ $Date: 2000-11-08 09:36:19 $
+ * last change: $Author: pluby $ $Date: 2001-02-12 03:30:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -111,8 +111,12 @@ int _cdecl main( int argc, char * argv[] )
#ifdef SAL_W32
OUString dllName( OUString::createFromAscii("cpld.dll") );
#else
+#ifdef MACOSX
+ OUString dllName( OUString::createFromAscii("libcpld.dylib.framework") );
+#else
OUString dllName( OUString::createFromAscii("libcpld.so") );
#endif
+#endif
if (pModule->load(dllName))
{
diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx
index e87e00cadbc2..285eb6ed4979 100644
--- a/stoc/test/testproxyfac.cxx
+++ b/stoc/test/testproxyfac.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: testproxyfac.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: dbo $ $Date: 2000-11-15 17:54:31 $
+ * last change: $Author: pluby $ $Date: 2001-02-12 03:30:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -192,7 +192,11 @@ static sal_Bool test_proxyfac( const Reference< XProxyFactory > & xProxyFac )
#ifdef UNX
#define REG_PREFIX "lib"
+#ifdef MACOSX
+#define DLL_POSTFIX ".dylib.framework"
+#else
#define DLL_POSTFIX ".so"
+#endif
#else
#define REG_PREFIX ""
#define DLL_POSTFIX ".dll"
diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx
index 13eb146ca5f4..ce87af980e1f 100644
--- a/stoc/test/testregistry.cxx
+++ b/stoc/test/testregistry.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: testregistry.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: dbo $ $Date: 2000-11-08 09:36:19 $
+ * last change: $Author: pluby $ $Date: 2001-02-12 03:30:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -198,8 +198,12 @@ void test_SimpleRegistry()
#ifdef SAL_W32
OUString dllName( OUString::createFromAscii("simreg.dll") );
#else
+#ifdef MACOSX
+ OUString dllName( OUString::createFromAscii("libsimreg.dylib.framework") );
+#else
OUString dllName( OUString::createFromAscii("libsimreg.so") );
#endif
+#endif
if (pModule->load(dllName))
{