Skip to content
Snippets Groups Projects
Commit 944ea4fb authored by Patrick Baudin's avatar Patrick Baudin
Browse files

[ptests] adds more enabled_if

parent c2d16d2b
No related branches found
No related tags found
No related merge requests found
...@@ -1394,6 +1394,7 @@ let command_string ~env ~result_fmt ~oracle_fmt command = ...@@ -1394,6 +1394,7 @@ let command_string ~env ~result_fmt ~oracle_fmt command =
(alias %S)\n \ (alias %S)\n \
(targets %S %S %a %a)\n \ (targets %S %S %a %a)\n \
(deps %S %S %S %a %a)\n \ (deps %S %S %S %a %a)\n \
(enabled_if (and true %a))\n\
(action (run %s %S %S %a))\n\ (action (run %s %S %S %a))\n\
)@." )@."
(* rule: *) (* rule: *)
...@@ -1411,6 +1412,8 @@ let command_string ~env ~result_fmt ~oracle_fmt command = ...@@ -1411,6 +1412,8 @@ let command_string ~env ~result_fmt ~oracle_fmt command =
wtest.oracle_err wtest.oracle_err
pp_list (List.map (Filename.concat wtest.oracle_dir) command.log_files) pp_list (List.map (Filename.concat wtest.oracle_dir) command.log_files)
pp_command_deps command pp_command_deps command
(* enabled_if: *)
Fmt.(list (var_libavailable plugin_as_package )) (list_of_deps command.deps.load_plugin)
(* action: *) (* action: *)
!wrapper_cmd !wrapper_cmd
wrapper_basename wrapper_basename
...@@ -1434,6 +1437,7 @@ let command_string ~env ~result_fmt ~oracle_fmt command = ...@@ -1434,6 +1437,7 @@ let command_string ~env ~result_fmt ~oracle_fmt command =
(alias %S)\n \ (alias %S)\n \
(targets %S %S %a %a)\n \ (targets %S %S %a %a)\n \
(deps %a)\n \ (deps %a)\n \
(enabled_if (and true %a))\n\
(action (with-stderr-to %S (with-stdout-to %S (%s (system %S)))))\n\ (action (with-stderr-to %S (with-stdout-to %S (%s (system %S)))))\n\
)@." )@."
(* rule: *) (* rule: *)
...@@ -1447,6 +1451,8 @@ let command_string ~env ~result_fmt ~oracle_fmt command = ...@@ -1447,6 +1451,8 @@ let command_string ~env ~result_fmt ~oracle_fmt command =
pp_list command.bin_files pp_list command.bin_files
(* deps: *) (* deps: *)
pp_command_deps command pp_command_deps command
(* enabled_if: *)
Fmt.(list (var_libavailable plugin_as_package )) (list_of_deps command.deps.load_plugin)
(* action: *) (* action: *)
cmderrlog cmderrlog
cmdreslog cmdreslog
...@@ -1458,6 +1464,7 @@ let command_string ~env ~result_fmt ~oracle_fmt command = ...@@ -1458,6 +1464,7 @@ let command_string ~env ~result_fmt ~oracle_fmt command =
Format.fprintf result_fmt Format.fprintf result_fmt
"(rule ; FILTER %s #%d OF TEST FILE %S\n \ "(rule ; FILTER %s #%d OF TEST FILE %S\n \
(deps %S) (deps %S)
(enabled_if (and true %a))\n\
(action (with-stdout-to %S (with-accepted-exit-codes (or 0 1 2 125) (system %S))))\n\ (action (with-stdout-to %S (with-accepted-exit-codes (or 0 1 2 125) (system %S))))\n\
)@." )@."
(* rule: *) (* rule: *)
...@@ -1466,6 +1473,8 @@ let command_string ~env ~result_fmt ~oracle_fmt command = ...@@ -1466,6 +1473,8 @@ let command_string ~env ~result_fmt ~oracle_fmt command =
command.file command.file
(* deps: *) (* deps: *)
fin fin
(* enabled_if: *)
Fmt.(list (var_libavailable plugin_as_package )) (list_of_deps command.deps.load_plugin)
(* action: *) (* action: *)
fout cmd fout cmd
in in
...@@ -1475,12 +1484,15 @@ let command_string ~env ~result_fmt ~oracle_fmt command = ...@@ -1475,12 +1484,15 @@ let command_string ~env ~result_fmt ~oracle_fmt command =
Format.fprintf result_fmt Format.fprintf result_fmt
"(rule ; COMPARE TARGET #%d OF TEST #%d FOR TEST FILE %S\n \ "(rule ; COMPARE TARGET #%d OF TEST #%d FOR TEST FILE %S\n \
(alias %s)\n \ (alias %s)\n \
(enabled_if (and true %a))\n\
(action (diff %S %S))\n\ (action (diff %S %S))\n\
)@." )@."
(* rule: *) (* rule: *)
n command.nth command.file n command.nth command.file
(* alias: *) (* alias: *)
(ptests_alias ~env) (ptests_alias ~env)
(* enabled_if: *)
Fmt.(list (var_libavailable plugin_as_package )) (list_of_deps command.deps.load_plugin)
(* action: *) (* action: *)
(SubDir.make_file (SubDir.oracle_dir ~env) log) (SubDir.make_file (SubDir.oracle_dir ~env) log)
log log
...@@ -1489,6 +1501,7 @@ let command_string ~env ~result_fmt ~oracle_fmt command = ...@@ -1489,6 +1501,7 @@ let command_string ~env ~result_fmt ~oracle_fmt command =
"(rule ; REPRODUCE TEST #%d OF TEST FILE %S\n \ "(rule ; REPRODUCE TEST #%d OF TEST FILE %S\n \
(alias %S)\n \ (alias %S)\n \
(deps %a (universe))\n \ (deps %a (universe))\n \
(enabled_if (and true %a))\n\
(action (%s (system %S)))\n\ (action (%s (system %S)))\n\
)@." )@."
(* rule: *) (* rule: *)
...@@ -1497,6 +1510,8 @@ let command_string ~env ~result_fmt ~oracle_fmt command = ...@@ -1497,6 +1510,8 @@ let command_string ~env ~result_fmt ~oracle_fmt command =
(mk_alias command "exec") (mk_alias command "exec")
(* deps: *) (* deps: *)
pp_command_deps command pp_command_deps command
(* enabled_if: *)
Fmt.(list (var_libavailable plugin_as_package )) (list_of_deps command.deps.load_plugin)
(* action: *) (* action: *)
accepted_exit_code accepted_exit_code
command_string command_string
...@@ -1505,6 +1520,7 @@ let command_string ~env ~result_fmt ~oracle_fmt command = ...@@ -1505,6 +1520,7 @@ let command_string ~env ~result_fmt ~oracle_fmt command =
"(rule ; SHOW TEST COMMAND #%d OF TEST FILE %S\n \ "(rule ; SHOW TEST COMMAND #%d OF TEST FILE %S\n \
(alias %S)\n \ (alias %S)\n \
(deps %a (universe))\n \ (deps %a (universe))\n \
(enabled_if (and true %a))\n\
(action (system %S))\n\ (action (system %S))\n\
)@." )@."
(* rule: *) (* rule: *)
...@@ -1513,6 +1529,8 @@ let command_string ~env ~result_fmt ~oracle_fmt command = ...@@ -1513,6 +1529,8 @@ let command_string ~env ~result_fmt ~oracle_fmt command =
(mk_alias command "exec.show") (mk_alias command "exec.show")
(* deps: *) (* deps: *)
pp_command_deps command (* to get an updated build even in case of using the result *) pp_command_deps command (* to get an updated build even in case of using the result *)
(* enabled_if: *)
Fmt.(list (var_libavailable plugin_as_package )) (list_of_deps command.deps.load_plugin)
(* action: *) (* action: *)
("echo '" ^ show_cmd wtest.cmd ^"'"); ("echo '" ^ show_cmd wtest.cmd ^"'");
...@@ -1521,20 +1539,26 @@ let command_string ~env ~result_fmt ~oracle_fmt command = ...@@ -1521,20 +1539,26 @@ let command_string ~env ~result_fmt ~oracle_fmt command =
Format.fprintf result_fmt Format.fprintf result_fmt
"(rule\n \ "(rule\n \
(alias %S)\n \ (alias %S)\n \
(enabled_if (and true %a))\n\
(action (diff %S %S))\n\ (action (diff %S %S))\n\
)@." )@."
(* alias: *) (* alias: *)
diff_alias diff_alias
(* enabled_if: *)
Fmt.(list (var_libavailable plugin_as_package )) (list_of_deps command.deps.load_plugin)
(* action: *) (* action: *)
wtest.oracle_out wtest.oracle_out
reslog; reslog;
Format.fprintf result_fmt Format.fprintf result_fmt
"(rule\n \ "(rule\n \
(alias %S)\n \ (alias %S)\n \
(enabled_if (and true %a))\n\
(action (diff %S %S))\n\ (action (diff %S %S))\n\
)@." )@."
(* alias: *) (* alias: *)
diff_alias diff_alias
(* enabled_if: *)
Fmt.(list (var_libavailable plugin_as_package )) (list_of_deps command.deps.load_plugin)
(* action: *) (* action: *)
wtest.oracle_err wtest.oracle_err
errlog; errlog;
...@@ -1659,6 +1683,7 @@ let process_file ~env ~result_fmt ~oracle_fmt file directory config modules = ...@@ -1659,6 +1683,7 @@ let process_file ~env ~result_fmt ~oracle_fmt file directory config modules =
(alias %s)\n \ (alias %s)\n \
(deps %a %a)\n \ (deps %a %a)\n \
(targets %a %a)\n \ (targets %a %a)\n \
(enabled_if (and true %a))\n\
(action (run %s %%{dep:%s} %S))\n\ (action (run %s %%{dep:%s} %S))\n\
)@." )@."
(* rule: *) (* rule: *)
...@@ -1671,6 +1696,8 @@ let process_file ~env ~result_fmt ~oracle_fmt file directory config modules = ...@@ -1671,6 +1696,8 @@ let process_file ~env ~result_fmt ~oracle_fmt file directory config modules =
(* targets: *) (* targets: *)
pp_list wtest.log pp_list wtest.log
pp_list wtest.bin pp_list wtest.bin
(* enabled_if: *)
Fmt.(list (var_libavailable plugin_as_package )) (list_of_deps cmd.deps.load_plugin)
(* action: *) (* action: *)
!wrapper_cmd !wrapper_cmd
wrapper_basename wrapper_basename
...@@ -1690,6 +1717,7 @@ let process_file ~env ~result_fmt ~oracle_fmt file directory config modules = ...@@ -1690,6 +1717,7 @@ let process_file ~env ~result_fmt ~oracle_fmt file directory config modules =
(alias %s)\n \ (alias %s)\n \
(deps (package frama-c)%a)\n \ (deps (package frama-c)%a)\n \
(targets %a %a)\n \ (targets %a %a)\n \
(enabled_if (and true %a))\n\
(action (system %S))\n\ (action (system %S))\n\
)@." )@."
(* rule: *) (* rule: *)
...@@ -1701,6 +1729,8 @@ let process_file ~env ~result_fmt ~oracle_fmt file directory config modules = ...@@ -1701,6 +1729,8 @@ let process_file ~env ~result_fmt ~oracle_fmt file directory config modules =
(* targets: *) (* targets: *)
pp_list wtest.log pp_list wtest.log
pp_list wtest.bin pp_list wtest.bin
(* enabled_if: *)
Fmt.(list (var_libavailable plugin_as_package )) (list_of_deps cmd.deps.load_plugin)
(* action: *) (* action: *)
wtest.cmd wtest.cmd
end; end;
...@@ -1711,6 +1741,7 @@ let process_file ~env ~result_fmt ~oracle_fmt file directory config modules = ...@@ -1711,6 +1741,7 @@ let process_file ~env ~result_fmt ~oracle_fmt file directory config modules =
"(rule ; SHOW EXECNOW COMMAND #%d OF TEST FILE %S\n \ "(rule ; SHOW EXECNOW COMMAND #%d OF TEST FILE %S\n \
(alias %s)\n \ (alias %s)\n \
(deps %a (universe))\n \ (deps %a (universe))\n \
(enabled_if (and true %a))\n\
(action (system %S))\n\ (action (system %S))\n\
)@." )@."
(* rule: *) (* rule: *)
...@@ -1719,6 +1750,8 @@ let process_file ~env ~result_fmt ~oracle_fmt file directory config modules = ...@@ -1719,6 +1750,8 @@ let process_file ~env ~result_fmt ~oracle_fmt file directory config modules =
(mk_alias cmd "execnow.show") (mk_alias cmd "execnow.show")
(* deps: *) (* deps: *)
pp_command_deps cmd (* to get an updated build even in case of using the result *) pp_command_deps cmd (* to get an updated build even in case of using the result *)
(* enabled_if: *)
Fmt.(list (var_libavailable plugin_as_package )) (list_of_deps cmd.deps.load_plugin)
(* action: *) (* action: *)
("echo '" ^ show_cmd wtest.cmd ^"'"); ("echo '" ^ show_cmd wtest.cmd ^"'");
; ;
...@@ -1726,12 +1759,15 @@ let process_file ~env ~result_fmt ~oracle_fmt file directory config modules = ...@@ -1726,12 +1759,15 @@ let process_file ~env ~result_fmt ~oracle_fmt file directory config modules =
Format.fprintf result_fmt Format.fprintf result_fmt
"(rule ; COMPARE TARGET #%d OF EXECNOW #%d FOR TEST FILE %S\n \ "(rule ; COMPARE TARGET #%d OF EXECNOW #%d FOR TEST FILE %S\n \
(alias %s)\n \ (alias %s)\n \
(enabled_if (and true %a))\n\
(action (diff %S %S))\n\ (action (diff %S %S))\n\
)@." )@."
(* rule: *) (* rule: *)
n nth file n nth file
(* alias: *) (* alias: *)
(ptests_alias ~env) (ptests_alias ~env)
(* enabled_if: *)
Fmt.(list (var_libavailable plugin_as_package )) (list_of_deps cmd.deps.load_plugin)
(* action: *) (* action: *)
(SubDir.make_file (SubDir.oracle_dir ~env) log) (SubDir.make_file (SubDir.oracle_dir ~env) log)
log log
......
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