diff --git a/.gitignore b/.gitignore index 141d31bb7..ca2f40822 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *~ *.tar.* .[^.]* +*.os Buildhelper.pyc optcache Makefile.in diff --git a/tests/SConscript b/tests/SConscript index 95ecdc0a7..dbb7e29a7 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -27,7 +27,7 @@ def treatPluginTestcase(env): """ env = env.Clone() env.Append(CPPPATH='plugin') - testplugin = env.SharedLibrary('hello_1', 'plugin/example_plugin.c', SHLIBPREFIX='') + testplugin = env.SharedLibrary('.libs/example_plugin', 'plugin/example_plugin.c', SHLIBPREFIX='') testExe = env.Program('test-plugin', ['plugin/plugin_main.c'] + corelib) env.Depends(testExe, testplugin) return testExe @@ -46,7 +46,6 @@ moduledirs = globRootdirs('*') isnt_plugin = lambda dir : dir!='plugin' moduledirs = filter(isnt_plugin, moduledirs) pluginExe = treatPluginTestcase(env) -print 'moduledirs: %s' %moduledirs artifacts['testsuite'] = ts = [ SingleTestExecutableSubdir(env, dir) for dir in moduledirs] + pluginExe @@ -62,8 +61,7 @@ artifacts['testsuite'] = ts = [ SingleTestExecutableSubdir(env, dir) for dir in # - it depends on all artifacts defined as "ts" above # runTs = env.Command(',testlog', ts, "./test.sh", chdir=1) - -env.Clean (runTs, [ ',*']) # declare tempfiles of test.sh as cleanable + # @@ -74,3 +72,5 @@ env.Clean (runTs, [ ',*']) # declare tempfiles of test.sh as cleanable env.Alias('testcode', ts ) env.Alias('check', runTs ) +# declare tempfiles of test.sh as cleanable +env.Clean ('check', [',testlog.pre',',expect_stdout',',stdout',',stderr',',testtmp','.libs'])