|
@@ -32,6 +32,7 @@ end;
|
|
procedure require_error(num : longint);
|
|
procedure require_error(num : longint);
|
|
begin
|
|
begin
|
|
required_error_num:=num;
|
|
required_error_num:=num;
|
|
|
|
+ accepted_error_num:=num;
|
|
end;
|
|
end;
|
|
|
|
|
|
procedure error_unit_exit;
|
|
procedure error_unit_exit;
|
|
@@ -42,14 +43,14 @@ 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 ',paramstr(0));
|
|
- 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 ',paramstr(0));
|
|
- 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);
|
|
end;
|
|
end;
|
|
@@ -57,12 +58,17 @@ begin
|
|
else if required_error_num<>0 then
|
|
else if required_error_num<>0 then
|
|
begin
|
|
begin
|
|
Write('Program ',paramstr(0));
|
|
Write('Program ',paramstr(0));
|
|
- 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);
|
|
end;
|
|
end;
|
|
if program_has_error then
|
|
if program_has_error then
|
|
- Halt(1);
|
|
|
|
|
|
+ Halt(1)
|
|
|
|
+ else
|
|
|
|
+ begin
|
|
|
|
+ exitcode:=0;
|
|
|
|
+ erroraddr:=nil;
|
|
|
|
+ end;
|
|
end;
|
|
end;
|
|
|
|
|
|
begin
|
|
begin
|