* Moved the tregistry2.pp test from packages to tests in order it to be run by daily test runs. tregistry2 has been failing for years and nobody has noticed this.

git-svn-id: trunk@48204 -

.gitattributes

@@ -3973,7 +3973,6 @@ packages/fcl-registry/tests/Makefile.fpc -text
 packages/fcl-registry/tests/regtestframework.pp -text
 packages/fcl-registry/tests/tcxmlreg.pp svneol=native#text/plain
 packages/fcl-registry/tests/testbasics.pp svneol=native#text/plain
-packages/fcl-registry/tests/tregistry2.pp svneol=native#text/plain
 packages/fcl-report/Makefile svneol=native#text/plain
 packages/fcl-report/Makefile.fpc svneol=native#text/plain
 packages/fcl-report/demos/company-logo.png -text svneol=unset#image/png
@@ -14425,6 +14424,7 @@ tests/test/packages/fcl-db/tdb5.pp svneol=native#text/plain
 tests/test/packages/fcl-db/tdb6.pp svneol=native#text/plain
 tests/test/packages/fcl-db/toolsunit.pas svneol=native#text/plain
 tests/test/packages/fcl-registry/tregistry1.pp svneol=native#text/plain
+tests/test/packages/fcl-registry/tregistry2.pp svneol=native#text/plain
 tests/test/packages/fcl-registry/tw35060a.pp svneol=native#text/plain
 tests/test/packages/fcl-registry/tw35060b.pp svneol=native#text/plain
 tests/test/packages/fcl-registry/tw35060c.pp svneol=native#text/plain

packages/fcl-registry/tests/testbasics.pp

@@ -21,7 +21,6 @@ type
     procedure TestSimpleWinRegistry;
     procedure TestDoubleWrite;
     procedure bug16395;
-    procedure TestAdv;
     procedure TestStringList;
     Procedure TestInt64;
     Procedure TestDeleteSubkey;
@@ -30,11 +29,7 @@ type
 implementation
 
 uses
-  registry
-{$ifdef windows}
-  , tregistry2
-{$endif windows}
-  ;
+  registry;
 
 { TTestBasics }
 
@@ -167,13 +162,6 @@ begin
   DeleteUserXmlFile;
 end;
 
-procedure TTestBasics.TestAdv;
-begin
-{$ifdef windows}
-  DoRegTest2;
-{$endif windows}
-end;
-
 Procedure TTestBasics.TestStringList;
 
 Var

packages/fcl-registry/tests/tregistry2.pp → tests/test/packages/fcl-registry/tregistry2.pp

@@ -4,14 +4,6 @@
 }
 
 {$ifdef FPC} {$mode delphi}  {$endif}
-unit tregistry2;
-
-interface
-
-procedure DoRegTest2;
-
-implementation
-
 uses Windows, SysUtils, Classes, registry;
 
 {$ifdef FPC}
@@ -24,7 +16,8 @@ const
   
 procedure TestFailed(ErrCode: integer);
 begin
-  raise Exception.Create('Test FAILED. Error code: ' + IntToStr(ErrCode));
+  writeln('Test FAILED. Error code: ' + IntToStr(ErrCode));
+  Halt(ErrCode);
 end;
 
 procedure ClearReg(const KeyName: string = '');
@@ -212,5 +205,6 @@ begin
   end;
 end;
 
+begin
+  DoRegTest2;
 end.
-