TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Pass SConf test macros into later tests

Browse source 
Some tests may benefit from the results of earlier tests.  Other tests
may give different results if the macros from earlier tests are defined.
SCons dependency checking rejects including dxxsconf.h during testing,
so save the results of self._check_macro and insert them into later
tests.  Some tests define their macros in other ways.  The macros from
those tests and are not yet inserted.
This commit is contained in:
Kp 2016-07-15 03:43:03 +00:00
parent dfcf28ff10
commit a9aa5552b7
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
SConstruct
View file

@ -329,6 +329,7 @@ struct %(N)s_derived : %(N)s_base {
self.successful_flags = defaultdict(list)
self._sconf_results = []
self.__tool_versions = []
self.__defined_macros = ''
def _quote_macro_value(v):
return v.strip().replace('\n', ' \\\n')
def _check_sconf_forced(self,calling_function):
@ -372,7 +373,10 @@ struct %(N)s_derived : %(N)s_base {
#define {macro_name} {macro_value}
{test}
""".format(macro_name=macro_name, macro_value=macro_value, test=test), **kwargs)
context.sconf.Define(macro_name, macro_value if r else _comment_not_supported)
if not r:
macro_value = _comment_not_supported
context.sconf.Define(macro_name, macro_value)
self.__defined_macros += '#define %s %s\n' % (macro_name, macro_value)
implicit_tests.append(_implicit_test.RecordedTest('check_ccache_distcc_ld_works', "assume ccache, distcc, C++ compiler, and C++ linker work"))
implicit_tests.append(_implicit_test.RecordedTest('check_ccache_ld_works', "assume ccache, C++ compiler, and C++ linker work"))
implicit_tests.append(_implicit_test.RecordedTest('check_distcc_ld_works', "assume distcc, C++ compiler, and C++ linker work"))
@ -617,13 +621,14 @@ help:assume C++ compiler works
r = action('''
%s
%s
%s
#undef main /* avoid -Dmain=SDL_main from libSDL */
int main(int argc,char**argv){(void)argc;(void)argv;
%s
;}
''' % (self.__tool_versions, text, main), ext)
''' % (self.__tool_versions, self.__defined_macros, text, main), ext)
# Some tests check that the compiler rejects an input.
# SConf considers the result a failure when the compiler
# rejects the input. For tests that consider a rejection to