diff --git a/src/plugins/e-acsl/src/main.ml b/src/plugins/e-acsl/src/main.ml index 8de1804974e4fdc9aafd6f7efd79040884f7ccba..8439a6b2b725c35b843318e35ada2accb345a919 100644 --- a/src/plugins/e-acsl/src/main.ml +++ b/src/plugins/e-acsl/src/main.ml @@ -42,12 +42,14 @@ let generate_code = Temporal.enable (Options.Temporal_validity.get ()); if Plugin.is_present "variadic" then begin let opt_name = "-variadic-translation" in - if Dynamic.Parameter.Bool.get opt_name () then begin + if Dynamic.Parameter.Bool.get opt_name () && + Options.Validate_format_strings.get () then begin if Ast.is_computed () then Options.abort - "The variadic translation must be turned off for E-ACSL. \ - Please use option '-variadic-no-translation'"; - Options.warning "deactivating variadic translation"; + "The variadic translation is incompatible with E-ACSL option \ + '%s'.@ Please use option '-variadic-no-translation'." + Options.Validate_format_strings.option_name + Options.warning "deactivating variadic translation"; Dynamic.Parameter.Bool.off opt_name (); end end; diff --git a/src/plugins/e-acsl/tests/format/test_config_ci b/src/plugins/e-acsl/tests/format/test_config_ci index eeaea353f8aafc1309b0f8b93ac86c545a2dd08a..982e648c83f6de086908d60d16620fa39297cb31 100644 --- a/src/plugins/e-acsl/tests/format/test_config_ci +++ b/src/plugins/e-acsl/tests/format/test_config_ci @@ -1 +1 @@ -STDOPT: #"-e-acsl-validate-format-strings" +STDOPT: #"-variadic-no-translation -e-acsl-validate-format-strings" diff --git a/src/plugins/e-acsl/tests/format/test_config_dev b/src/plugins/e-acsl/tests/format/test_config_dev index 636b97b921455af4ec13f54c6034decf21ba3975..aae787763c6565f6f717eb03b30a8221feb90fb6 100644 --- a/src/plugins/e-acsl/tests/format/test_config_dev +++ b/src/plugins/e-acsl/tests/format/test_config_dev @@ -1,2 +1,2 @@ -MACRO: ROOT_EACSL_GCC_OPTS_EXT --validate-format-strings --full-mtracking +MACRO: ROOT_EACSL_GCC_OPTS_EXT --validate-format-strings --full-mtracking -F -variadic-no-translation MACRO: ROOT_EACSL_EXEC_FILTER @SEDCMD@ -e "s|/.*/share/e-acsl|FRAMAC_SHARE/e-acsl|"