Merge pull request #5407 from thk123/fix-help-text

Fix help text in goto-harness

Author: Thomas Kiley

regression/goto-harness/associated-size-parameter/test-invalid-association.desc

@@ -0,0 +1,9 @@
+CORE
+main.c
+--harness-type call-function --function test --associated-array-size array:sze
+Expected parameter: \"sze\" on function \"test\"
+^EXIT=1$
+^SIGNAL=0$
+--
+--
+Tes the error message for invalid array size association is reported correctly.

src/goto-harness/function_call_harness_generator.cpp

@@ -508,7 +508,11 @@ function_call_harness_generatort::implt::declare_arguments(
         associated_array_size_argument == parameter_name_to_argument_name.end())
       {
         throw invalid_command_line_argument_exceptiont{
-          "associated array size is not there",
+          "could not find parameter to associate the array size of array \"" +
+            id2string(parameter_name) + "\" (Expected parameter: \"" +
+            id2string(associated_array_size_parameter) + "\" on function \"" +
+            id2string(function_to_call.display_name()) + "\" in " +
+            function_to_call.location.as_string() + ")",
           "--" FUNCTION_HARNESS_GENERATOR_ASSOCIATED_ARRAY_SIZE_OPT};
       }
       function_argument_to_associated_array_size.insert(

src/goto-harness/goto_harness_parse_options.cpp

@@ -174,7 +174,8 @@ void goto_harness_parse_optionst::help()
     << " goto-harness <in> <out> --harness-function-name <name> --harness-type "
        "<harness-type> [harness options]\n"
     << "\n"
-    << "<in> <out>                 goto binaries to read from / write to\n"
+    << "<in>                       goto binaries to read from\n"
+    << "<out>                      C file to write the harness to\n"
     << "--harness-function-name    the name of the harness function to "
        "generate\n"
     << "--harness-type             one of the harness types listed below\n"