Further tweaks to SCons's auto tests

We should do autotests only after setting path to sconsign,
otherwise using the same working directory and different
build directories will eventually break.
This commit is contained in:
2014-07-10 03:53:37 +06:00
parent f0c06e71ba
commit b2e9fffc3d

View File

@@ -595,16 +595,6 @@ if not os.path.isdir ( B.root_build_dir):
# if not os.path.isdir(B.doc_build_dir) and env['WITH_BF_DOCS']:
# os.makedirs ( B.doc_build_dir )
# Put all auto configuration run-time tests here
from FindSharedPtr import FindSharedPtr
from FindUnorderedMap import FindUnorderedMap
conf = Configure(env)
conf.env.Append(LINKFLAGS=env['PLATFORM_LINKFLAGS'])
FindSharedPtr(conf)
FindUnorderedMap(conf)
env = conf.Finish()
###################################
# Ensure all data files are valid #
@@ -787,6 +777,19 @@ B.init_lib_dict()
##### END SETUP ##########
# Put all auto configuration run-time tests here
from FindSharedPtr import FindSharedPtr
from FindUnorderedMap import FindUnorderedMap
conf = Configure(env)
conf.env.Append(LINKFLAGS=env['PLATFORM_LINKFLAGS'])
FindSharedPtr(conf)
FindUnorderedMap(conf)
env = conf.Finish()
# End of auto configuration
Export('env')
VariantDir(B.root_build_dir+'/source', 'source', duplicate=0)