summaryrefslogtreecommitdiff
path: root/smoketest
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2015-09-14 16:47:27 +0200
committerJan Holesovsky <kendy@collabora.com>2015-09-14 16:48:21 +0200
commit650d9d4b1c6faca7224ae2f3b83ca30be801d465 (patch)
treebfbbfa13696533847e00c05e3eb9ec95a9a135fc /smoketest
parent7598ec2bd1516d4f2b7b2df932e86723cbec31c5 (diff)
Revert the pre-init work for now.
Diffstat (limited to 'smoketest')
-rw-r--r--smoketest/libtest.cxx24
1 files changed, 1 insertions, 23 deletions
diff --git a/smoketest/libtest.cxx b/smoketest/libtest.cxx
index 60ee19e62357..ae87c796112a 100644
--- a/smoketest/libtest.cxx
+++ b/smoketest/libtest.cxx
@@ -83,29 +83,7 @@ int main (int argc, char **argv)
return 1;
// coverity[tainted_string] - build time test tool
- char *install_path = argv[1];
-
- if( argc > 4 )
- {
- fprintf( stderr, "testing preinit\n");
- char *imp_lib;
- void *dlhandle;
- dlhandle = lok_dlopen( install_path, &imp_lib );
- if( !dlhandle )
- {
- fprintf( stderr, "Failed to link '%s'\n", lok_dlerror() );
- return -1;
- }
- LokHookPreInit *preinit = (LokHookPreInit *) lok_dlsym( dlhandle, "lok_preinit" );
- if( !preinit )
- {
- fprintf( stderr, "Failed to find pre-init symbol: %s\n", lok_dlerror() );
- return -1;
- }
- preinit( install_path, NULL );
- }
-
- Office *pOffice = lok_cpp_init( install_path );
+ Office *pOffice = lok_cpp_init( argv[1] );
if( !pOffice )
{
fprintf( stderr, "Failed to initialize\n" );