Skip to content
Snippets Groups Projects
Commit 38296d70 authored by Andre Maroneze's avatar Andre Maroneze
Browse files

Merge branch 'fix/andre/tests-fc-script' into 'master'

[tests] Stabilize fc_script oracle when Frama-C is in the path

See merge request frama-c/frama-c!2790
parents d28cc92b 35b50156
No related branches found
No related tags found
No related merge requests found
......@@ -250,7 +250,7 @@ gnumakefile.write_text("".join(lines))
print(f"Template created: {gnumakefile}")
if not framac_in_path:
if not "PTESTS_TESTING" in os.environ and not framac_in_path:
print(f"Frama-C not in path, adding path.mk to {dir}")
frama_c_script = bindir / "frama-c-script"
os.system(f"{frama_c_script} make-path {dir}")
......
......@@ -10,8 +10,6 @@ warning: result/GNUmakefile already exists. Overwrite? [y/N] Main target name: S
warning: 'main' seems to be defined multiple times.
Is this ok? [Y/n] compile_commands.json exists, add option -json-compilation-database? [Y/n] Add stub for function main (only needed if it uses command-line arguments)? [y/N] Please define the architectural model (machdep) of the target machine.
Known machdeps: x86_16 x86_32 x86_64 gcc_x86_16 gcc_x86_32 gcc_x86_64 ppc_32 msvc_x86_64
Please enter the machdep [x86_32]: 'invalid_machdep' is not a standard machdep. Proceed anyway? [y/N]Please enter the machdep [x86_32]: warning: result/fc_stubs.c already exists. Overwrite? [y/N] Wrote to: result/path.mk
Created stub for main function: result/fc_stubs.c
Please enter the machdep [x86_32]: 'invalid_machdep' is not a standard machdep. Proceed anyway? [y/N]Please enter the machdep [x86_32]: warning: result/fc_stubs.c already exists. Overwrite? [y/N] Created stub for main function: result/fc_stubs.c
Template created: result/GNUmakefile
Frama-C not in path, adding path.mk to result
Running ptests: cleaning up after tests...
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment