From 0710825bda22d8fdba1ada6fefcaadbcadae3d02 Mon Sep 17 00:00:00 2001
From: pierre <pierre@freepascal.org>
Date: Mon, 16 Mar 2020 21:50:24 +0000
Subject: [PATCH]   Merge of commit 43189 from trunk branch   as merge of 43188
 seems to generate troubles with   testsuite database.

------------------------------------------------------------------------
r43189 | florian | 2019-10-13 11:42:33 +0000 (Sun, 13 Oct 2019) | 1 line

  * sorted out tests
------------------------------------------------------------------------
--- Merging r43189 into '.':
U    tests/webtbs/tw34848.pp
D    tests/webtbs/tw40850.pp
--- Recording mergeinfo for merge of r43189 into '.':
 U   .

git-svn-id: branches/fixes_3_2@44306 -
---
 .gitattributes          |  1 -
 tests/webtbs/tw34848.pp |  2 ++
 tests/webtbs/tw40850.pp | 43 -----------------------------------------
 3 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 tests/webtbs/tw40850.pp

diff --git a/.gitattributes b/.gitattributes
index 7e1a883c19..e5cb953131 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -17686,7 +17686,6 @@ tests/webtbs/tw4058.pp svneol=native#text/plain
 tests/webtbs/tw4068.pp svneol=native#text/plain
 tests/webtbs/tw4078.pp svneol=native#text/plain
 tests/webtbs/tw4080.pp svneol=native#text/plain
-tests/webtbs/tw40850.pp svneol=native#text/pascal
 tests/webtbs/tw4086.pp svneol=native#text/plain
 tests/webtbs/tw4089.pp svneol=native#text/plain
 tests/webtbs/tw4093.pp svneol=native#text/plain
diff --git a/tests/webtbs/tw34848.pp b/tests/webtbs/tw34848.pp
index 8153a22f79..f0b1d6ec2c 100644
--- a/tests/webtbs/tw34848.pp
+++ b/tests/webtbs/tw34848.pp
@@ -24,6 +24,8 @@ begin
    if EOF(test_file) then
       writeln('EOF reached');
    pos := filepos(test_file);
+   if pos<>9 then
+     halt(1);
    writeln('File position: ', pos);
    read(test_file, my_bits);
    writeln(my_bits);
diff --git a/tests/webtbs/tw40850.pp b/tests/webtbs/tw40850.pp
deleted file mode 100644
index 093a275450..0000000000
--- a/tests/webtbs/tw40850.pp
+++ /dev/null
@@ -1,43 +0,0 @@
-{$mode iso}
-program mytest;
-
-procedure my_test1;
-type byte_file = file of byte;
-   
-var test_file : byte_file;
-   test_text  : text;
-   loc	      : integer;
-   len	      : integer;
-   my_bits    : byte;
-   pos	      : int64;
-begin
-   assign(test_text, 'tw40850.data');
-   rewrite(test_text);
-   write(test_text,'0123456789'#10);
-   close(test_text);
-   loc := 9;
-   assign(test_file, 'tw40850.data');
-   reset(test_file);
-   len := filesize(test_file);
-   writeln('File size: ', len);
-   seek(test_file, loc);
-   if EOF(test_file) then
-      writeln('EOF reached');
-   pos := filepos(test_file);
-   if pos<>9 then
-     halt(1);
-   writeln('File position: ', pos);
-   read(test_file, my_bits);
-   if my_bits<>57 then
-     halt(1);
-   writeln(my_bits);
-   read(test_file, my_bits);
-   writeln(my_bits);
-   if my_bits<>10 then
-     halt(1);
-   close(test_file);
-   writeln('ok');
-end;
-begin
-   my_test1;
-end.