now the testsuite runs with SCons as well..

This commit is contained in:
Fischlurch 2007-08-18 06:13:39 +02:00
parent 0283653026
commit aaf2ee4928
2 changed files with 5 additions and 4 deletions

1
.gitignore vendored
View file

@ -2,6 +2,7 @@
*~
*.tar.*
.[^.]*
*.os
Buildhelper.pyc
optcache
Makefile.in

View file

@ -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'])