out = out[:-len(conflatedErrorOutput)]
err += conflatedErrorOutput
- return (out, err, exitCode, timeoutInfo)
+ return (out, err, exitCode, timeoutInfo, parsedCommands)
def _makeConfigTest(config):
# Make sure the support directories exist, which is needed to create
with _makeConfigTest(config) as test:
with open(test.getSourcePath(), 'w') as sourceFile:
sourceFile.write(source)
- _, _, exitCode, _ = _executeScriptInternal(test, ['%{{build}} {}'.format(' '.join(additionalFlags))])
+ _, _, exitCode, _, _ = _executeScriptInternal(test, ['%{{build}} {}'.format(' '.join(additionalFlags))])
return exitCode == 0
@_memoizeExpensiveOperation(lambda c, p, args=None: (c.substitutions, c.environment, p, args))
with _makeConfigTest(config) as test:
with open(test.getSourcePath(), 'w') as source:
source.write(program)
- _, err, exitCode, _ = _executeScriptInternal(test, ['%{build}'])
+ _, err, exitCode, _, buildcmd = _executeScriptInternal(test, ['%{build}'])
if exitCode != 0:
- raise ConfigurationCompilationError("Failed to build program, stderr is:\n{}".format(err))
+ raise ConfigurationCompilationError("Failed to build program, cmd:\n{}\nstderr is:\n{}".format(buildcmd, err))
- out, err, exitCode, _ = _executeScriptInternal(test, ["%{{run}} {}".format(' '.join(args))])
+ out, err, exitCode, _, runcmd = _executeScriptInternal(test, ["%{{run}} {}".format(' '.join(args))])
if exitCode != 0:
- raise ConfigurationRuntimeError("Failed to run program, stderr is:\n{}".format(err))
+ raise ConfigurationRuntimeError("Failed to run program, cmd:\n{}\nstderr is:\n{}".format(runcmd, err))
actualOut = re.search("# command output:\n(.+)\n$", out, flags=re.DOTALL)
actualOut = actualOut.group(1) if actualOut else ""
checking whether that succeeds.
"""
with _makeConfigTest(config) as test:
- out, err, exitCode, timeoutInfo = _executeScriptInternal(test, [
+ out, err, exitCode, timeoutInfo, _ = _executeScriptInternal(test, [
"%{{cxx}} -xc++ {} -Werror -fsyntax-only %{{flags}} %{{compile_flags}} {}".format(os.devnull, flag)
])
return exitCode == 0
could appear on the right-hand-side of a `RUN:` keyword.
"""
with _makeConfigTest(config) as test:
- _, _, exitCode, _ = _executeScriptInternal(test, script)
+ _, _, exitCode, _, _ = _executeScriptInternal(test, script)
return exitCode
@_memoizeExpensiveOperation(lambda c, s: (c.substitutions, c.environment, s))
could appear on the right-hand-side of a `RUN:` keyword.
"""
with _makeConfigTest(config) as test:
- out, _, exitCode, _ = _executeScriptInternal(test, command)
+ out, _, exitCode, _, _ = _executeScriptInternal(test, command)
if exitCode != 0:
raise ConfigurationRuntimeError()
return out
# include <__config_site>
#endif
""")
- unparsedOutput, err, exitCode, _ = _executeScriptInternal(test, [
+ unparsedOutput, err, exitCode, _, _ = _executeScriptInternal(test, [
"%{{cxx}} %s -dM -E %{{flags}} %{{compile_flags}} {}".format(flags)
])
if exitCode != 0: