From 35b50156fb2cffcb78319f300c82caac96d98fd1 Mon Sep 17 00:00:00 2001
From: Andre Maroneze <andre.maroneze@cea.fr>
Date: Thu, 20 Aug 2020 16:04:56 +0200
Subject: [PATCH] [tests] Stabilize fc_script oracle when Frama-C is in the
path
---
share/analysis-scripts/make_template.py | 2 +-
tests/fc_script/oracle/make_template.res | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/share/analysis-scripts/make_template.py b/share/analysis-scripts/make_template.py
index 419dc9d4430..504043a6ebf 100755
--- a/share/analysis-scripts/make_template.py
+++ b/share/analysis-scripts/make_template.py
@@ -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}")
diff --git a/tests/fc_script/oracle/make_template.res b/tests/fc_script/oracle/make_template.res
index 8d4a89eefce..eb6734b3ca4 100644
--- a/tests/fc_script/oracle/make_template.res
+++ b/tests/fc_script/oracle/make_template.res
@@ -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...
--
GitLab