Formatter

This commit is contained in:
Ivan Kravets
2020-01-24 19:47:20 +02:00
parent 8fce660afa
commit 2de46f545f
2 changed files with 14 additions and 10 deletions

View File

@ -326,14 +326,12 @@ def ConfigureDebugFlags(env):
debug_flags = env.ParseFlags(env.GetProjectOption("debug_build_flags")) debug_flags = env.ParseFlags(env.GetProjectOption("debug_build_flags"))
env.MergeFlags(debug_flags) env.MergeFlags(debug_flags)
optimization_flags = [f for f in debug_flags.get("CCFLAGS", []) if f.startswith( optimization_flags = [
("-O", "-g"))] f for f in debug_flags.get("CCFLAGS", []) if f.startswith(("-O", "-g"))
]
if optimization_flags: if optimization_flags:
env.AppendUnique( env.AppendUnique(ASFLAGS=optimization_flags, LINKFLAGS=optimization_flags)
ASFLAGS=optimization_flags,
LINKFLAGS=optimization_flags
)
def ConfigureTestTarget(env): def ConfigureTestTarget(env):

View File

@ -136,8 +136,11 @@ int main() {
for line in build_output.split("\n"): for line in build_output.split("\n"):
if line.startswith("gcc"): if line.startswith("gcc"):
assert all(line.count(flag) == 1 for flag in ("-Og", "-g2", "-ggdb2")) assert all(line.count(flag) == 1 for flag in ("-Og", "-g2", "-ggdb2"))
assert all(line.count("-%s%d" % (flag, level)) == 0 for flag in ( assert all(
"O", "g", "ggdb") for level in (0, 1, 3)) line.count("-%s%d" % (flag, level)) == 0
for flag in ("O", "g", "ggdb")
for level in (0, 1, 3)
)
assert "-Os" not in line assert "-Os" not in line
@ -167,6 +170,9 @@ int main() {
for line in build_output.split("\n"): for line in build_output.split("\n"):
if line.startswith("gcc"): if line.startswith("gcc"):
assert all(line.count(f) == 1 for f in custom_debug_build_flags) assert all(line.count(f) == 1 for f in custom_debug_build_flags)
assert all(line.count("-%s%d" % (flag, level)) == 0 for flag in ( assert all(
"O", "g", "ggdb") for level in (0, 1, 2)) line.count("-%s%d" % (flag, level)) == 0
for flag in ("O", "g", "ggdb")
for level in (0, 1, 2)
)
assert all("-O%s" % optimization not in line for optimization in ("g", "s")) assert all("-O%s" % optimization not in line for optimization in ("g", "s"))