* Show arguments of command in the error message if the command failed

 * Make sure that compile-info is shown so that parsing the compiler-output makes sense

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@16893 3ad0048d-3df7-0310-abae-a5850022a9f2

1 files changed, 9 insertions, 2 deletions

diff --git a/packages/fpmkunit/src/fpmkunit.pp b/packages/fpmkunit/src/fpmkunit.pp
index e1ce2bee45..79253753ae 100644
--- a/packages/fpmkunit/src/fpmkunit.pp
+++ b/packages/fpmkunit/src/fpmkunit.pp
@@ -1232,7 +1232,7 @@ begin
     if Verbose then
       P.CommandLine := Path + ' ' + ComLine
     else
-      P.CommandLine := Path + ' -vq ' + ComLine;
+      P.CommandLine := Path + ' -viq ' + ComLine;
 
     P.Options := [poUsePipes];
 
@@ -3406,6 +3406,7 @@ end;
 procedure TBuildEngine.ExecuteCommand(const Cmd,Args : String; IgnoreError : Boolean = False);
 Var
   E : Integer;
+  cmdLine: string;
 begin
   Log(vlInfo,SInfoExecutingCommand,[Cmd,Args]);
   if ListMode then
@@ -3415,7 +3416,13 @@ begin
       // We should check cmd for spaces, and move all after first space to args.
       E:=ExecuteFPC(Verbose, cmd, args);
       If (E<>0) and (not IgnoreError) then
-        Error(SErrExternalCommandFailed,[Cmd,E]);
+        begin
+          if trim(Args)<>'' then
+            cmdLine := cmd + ' ' + trim(args)
+          else
+            cmdline := cmd;
+          Error(SErrExternalCommandFailed,[cmdLine,E]);
+        end;
     end;
 end;