|
@@ -29,7 +29,7 @@ end;
|
|
|
|
|
|
procedure error;
|
|
procedure error;
|
|
begin
|
|
begin
|
|
- Writeln('Error in ',paramstr(0));
|
|
|
|
|
|
+ Writeln('Error' {$ifdef FPC_HAS_FEATURE_COMMANDARGS},' in ',paramstr(0){$endif FPC_HAS_FEATURE_COMMANDARGS});
|
|
program_has_error:=true;
|
|
program_has_error:=true;
|
|
end;
|
|
end;
|
|
|
|
|
|
@@ -53,14 +53,14 @@ begin
|
|
begin
|
|
begin
|
|
if (required_error_num<>0) and (exitcode<>required_error_num) then
|
|
if (required_error_num<>0) and (exitcode<>required_error_num) then
|
|
begin
|
|
begin
|
|
- Write('Program ',paramstr(0));
|
|
|
|
|
|
+ Write('Program'{$ifdef FPC_HAS_FEATURE_COMMANDARGS},' ',paramstr(0){$endif FPC_HAS_FEATURE_COMMANDARGS});
|
|
Write(' exited with error ',exitcode,' whereas error ');
|
|
Write(' exited with error ',exitcode,' whereas error ');
|
|
Writeln(required_error_num,' was expected');
|
|
Writeln(required_error_num,' was expected');
|
|
Halt(1);
|
|
Halt(1);
|
|
end
|
|
end
|
|
else if exitcode<>accepted_error_num then
|
|
else if exitcode<>accepted_error_num then
|
|
begin
|
|
begin
|
|
- Write('Program ',paramstr(0));
|
|
|
|
|
|
+ Write('Program'{$ifdef FPC_HAS_FEATURE_COMMANDARGS},' ',paramstr(0){$endif FPC_HAS_FEATURE_COMMANDARGS});
|
|
Write(' exited with error ',exitcode,' whereas only error ');
|
|
Write(' exited with error ',exitcode,' whereas only error ');
|
|
Writeln(accepted_error_num,' was expected');
|
|
Writeln(accepted_error_num,' was expected');
|
|
Halt(1);
|
|
Halt(1);
|
|
@@ -68,7 +68,7 @@ begin
|
|
end
|
|
end
|
|
else if required_error_num<>0 then
|
|
else if required_error_num<>0 then
|
|
begin
|
|
begin
|
|
- Write('Program ',paramstr(0));
|
|
|
|
|
|
+ Write('Program'{$ifdef FPC_HAS_FEATURE_COMMANDARGS},' ',paramstr(0){$endif FPC_HAS_FEATURE_COMMANDARGS});
|
|
Write(' exited without error whereas error ');
|
|
Write(' exited without error whereas error ');
|
|
Writeln(required_error_num,' was expected');
|
|
Writeln(required_error_num,' was expected');
|
|
Halt(1);
|
|
Halt(1);
|