Merge pull request diffblue#1294 from diffblue/goto-gcc-fix

fix verbosity in goto-gcc

Author: tautschnig

regression/goto-gcc/verbosity1/main.c

@@ -0,0 +1,4 @@
+int main()
+{
+  return 0;
+}

regression/goto-gcc/verbosity1/test.desc

@@ -0,0 +1,9 @@
+CORE
+main.c
+--version
+^EXIT=0$
+^SIGNAL=0$
+--
+^RUN: .* --version
+^warning: ignoring
+^CONVERSION ERROR$

regression/goto-gcc/verbosity2/main.c

@@ -0,0 +1,4 @@
+int main()
+{
+  return 0;
+}

regression/goto-gcc/verbosity2/test.desc

@@ -0,0 +1,9 @@
+CORE
+main.c
+--version --verbosity 10
+^EXIT=0$
+^SIGNAL=0$
+^RUN: .* --version
+--
+^warning: ignoring
+^CONVERSION ERROR$

src/goto-cc/gcc_mode.cpp

@@ -333,6 +333,14 @@ int gcc_modet::doit()
 
   unsigned int verbosity=1;
 
+  if(cmdline.isset("Wall") || cmdline.isset("Wextra"))
+    verbosity=2;
+
+  if(cmdline.isset("verbosity"))
+    verbosity=unsafe_string2unsigned(cmdline.get_value("verbosity"));
+
+  gcc_message_handler.set_verbosity(verbosity);
+
   bool act_as_bcc=
     base_name=="bcc" ||
     base_name.find("goto-bcc")!=std::string::npos;
@@ -381,14 +389,6 @@ int gcc_modet::doit()
     return EX_OK;
   }
 
-  if(cmdline.isset("Wall") || cmdline.isset("Wextra"))
-    verbosity=2;
-
-  if(cmdline.isset("verbosity"))
-    verbosity=unsafe_string2unsigned(cmdline.get_value("verbosity"));
-
-  gcc_message_handler.set_verbosity(verbosity);
-
   if(act_as_ld)
   {
     if(produce_hybrid_binary)