From a912159d700e8934b088feee9eef1ca88bfd065f Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Tue, 28 Oct 2008 01:55:45 +0100 Subject: [PATCH] re-enabled building of the testpluginc.so --- admin/SConscript | 2 +- tests/SConscript | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/admin/SConscript b/admin/SConscript index d0ad7b84e..2737bab7e 100644 --- a/admin/SConscript +++ b/admin/SConscript @@ -8,7 +8,7 @@ Import('env','envgtk','artifacts','core') vgsuppr = env.Program('#$BINDIR/vgsuppression',['vgsuppression.c']+core) rsvg = envgtk.Program('#$BINDIR/rsvg-convert','rsvg-convert.c') -artifacts['tools'] += [ vgsuppr ## for supressing false valgrind alarms +artifacts['tools'] += [ vgsuppr ## for suppressing false valgrind alarms + rsvg ## for rendering SVG icons (uses librsvg) ] diff --git a/tests/SConscript b/tests/SConscript index f115d152b..d28b70218 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -52,15 +52,12 @@ def treatPluginTestcase(env): prfx = path.join(tree,'example_plugin') oC = env.SharedObject(prfx, prfx+'.c') oCPP = env.SharedObject(prfx+'_cpp', prfx+'.cpp') - testplugin = ( env.SharedLibrary('#$BINDIR/.libs/example_plugin', oC, SHLIBPREFIX='') - + env.SharedLibrary('#$BINDIR/.libs/example_plugin_cpp', oCPP, SHLIBPREFIX='') + testplugin = ( env.SharedLibrary('#$BINDIR/.libs/examplepluginc', oC, SHLIBPREFIX='') + +# doesn't compile yet... +# + env.SharedLibrary('#$BINDIR/.libs/exampleplugincpp', oCPP, SHLIBPREFIX='') ) -# testExe = env.Program('#$BINDIR/test-plugin', ['plugin/plugin_main.c'] + core) -# env.Depends(testExe, testplugin) -# return testExe - - # 10/2008 example_plugin moved to backend directory. - # ...we should try to find some convention here + return testplugin #-- it depends (at the moment) on a specific isolated test-plugin, # which is not integrated in the "normal procedure" for building Plugins @@ -78,7 +75,7 @@ specials = ['plugin','library','backend'] artifacts['testsuite'] = ts = ( [ testExecutable(env, dir) for dir in moduledirs if not dir in specials] -# + treatPluginTestcase(env) + + treatPluginTestcase(env) + testCollection(env, 'library') + testCollection(env, 'backend') )