Merged revisions 10335,10343,10352-10356,10358-10360,10364-10366,10369-10370,10373-10374,10376-10381,10387-10391,10393,10398,10400,10403,10423,10430,10436,10441,10444-10446,10452,10454,10468,10472,10474,10489-10491,10503,10507,10509-10515,10522,10524 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

........
  r10335 | florian | 2008-02-16 09:52:57 +0100 (Sat, 16 Feb 2008) | 2 lines
  
  * naming fixed
........
  r10454 | jonas | 2008-03-07 10:15:03 +0100 (Fri, 07 Mar 2008) | 2 lines
  
    * fixed test for 64 bit platforms
........
  r10468 | jonas | 2008-03-09 20:34:22 +0100 (Sun, 09 Mar 2008) | 3 lines
  
    + added {$goto on} so it still compiles on systems without a
      default config file (or one without -Sg in it)
........
  r10474 | jonas | 2008-03-11 20:31:09 +0100 (Tue, 11 Mar 2008) | 2 lines
  
    * fixed test
........
  r10524 | jonas | 2008-03-21 16:30:44 +0100 (Fri, 21 Mar 2008) | 3 lines
  
    * applies suggestion from Vincent to hopefully fix random lockups in the
      test
........

git-svn-id: branches/fixes_2_2@10538 -

.gitattributes

@@ -6690,6 +6690,7 @@ tests/tbs/tb0539.pp svneol=native#text/plain
 tests/tbs/tb0540.pp svneol=native#text/x-pascal
 tests/tbs/tb0541.pp svneol=native#text/plain
 tests/tbs/tb0542.pp svneol=native#text/plain
+tests/tbs/tb0544.pp svneol=native#text/plain
 tests/tbs/tb0545.pp svneol=native#text/plain
 tests/tbs/tb205.pp svneol=native#text/plain
 tests/tbs/ub0060.pp svneol=native#text/plain

tests/tbs/tb0544.pp

@@ -0,0 +1,15 @@
+
+type SomeType = ( SomeElem );
+
+const ElemSet = [ SomeElem ];
+
+var
+  b  : boolean;
+begin
+   b:=(SomeElem in ElemSet);
+   writeln(b);
+   b:=(SomeElem in (ElemSet + []));
+   writeln(b);
+   if not b then
+     halt(1);
+end.

tests/utils/dotest.pp

@@ -14,6 +14,8 @@
 
  **********************************************************************}
 {$H+}
+{$goto on}
+
 program dotest;
 uses
   dos,

tests/webtbs/tw10224.pp

@@ -7,13 +7,14 @@ var
 
 procedure expect(const v,s:string);
 var
-  s1 : string;
+  s1,s2 : string;
 begin
-  s1:=SetDirSeparators(s);
-  writeln('relative path: "',v,'"');
-  if v<>s then
+  s1:=SetDirSeparators(v);
+  s2:=SetDirSeparators(s);
+  writeln('relative path: "',s1,'"');
+  if s1<>s2 then
     begin
-      writeln('Error, expected "',s,'"');
+      writeln('Error, expected "',s2,'"');
       err:=true;
     end;
 end;

tests/webtbs/tw3695.pp

@@ -64,6 +64,7 @@ begin
     //WriteLn('Loop forever inside Tester.run when compiled by FPC 1.9.8');
   end;
   thread.Terminate;
+  CheckSynchronize;
   thread.waitfor;
 end;