2012-10-11 18:07 UTC+0200 Viktor Szakats (harbour syenar.net)

* contrib/hbblat/tests/blatcmd.prg * contrib/hbblat/tests/blattest.prg * contrib/hbbz2/tests/test.prg * contrib/hbcomm/tests/test.prg * contrib/hbcups/tests/test.prg * contrib/hbexpat/tests/test.prg * contrib/hbexpat/tests/tohash.prg * contrib/hbfbird/tests/simple.prg * contrib/hbfbird/tests/stress.prg * contrib/hbfbird/tests/test.prg * contrib/hbfimage/tests/fitest.prg * contrib/hbgs/tests/testgs.prg * contrib/hbhpdf/tests/harupdf.prg * contrib/hblzf/tests/test.prg * contrib/hbmagic/tests/hbmagit.prg * contrib/hbmemio/tests/test.prg * contrib/hbmxml/tests/custom.prg * contrib/hbmxml/tests/reminder.prg * contrib/hbmxml/tests/testmxml.prg * contrib/hbmysql/tests/test.prg * contrib/hbmzip/tests/myunzip.prg * contrib/hbmzip/tests/myzip.prg * contrib/hbodbc/tests/odbccall.prg * contrib/hbodbc/tests/odbcdemo.prg * contrib/hbodbc/tests/testodbc.prg * contrib/hbpgsql/tests/async.prg * contrib/hbpgsql/tests/cache.prg * contrib/hbpgsql/tests/dbf2pg.prg * contrib/hbpgsql/tests/simple.prg * contrib/hbpgsql/tests/stress.prg * contrib/hbpgsql/tests/test.prg * contrib/hbsms/tests/send.prg * contrib/hbsqlit3/tests/authoriz.prg * contrib/hbsqlit3/tests/backup.prg * contrib/hbsqlit3/tests/blob.prg * contrib/hbsqlit3/tests/hdbctest.prg * contrib/hbsqlit3/tests/hooks.prg * contrib/hbsqlit3/tests/metadata.prg * contrib/hbsqlit3/tests/pack.prg * contrib/hbsqlit3/tests/sl3_test.prg * contrib/hbssl/tests/bio.prg * contrib/hbssl/tests/crypt.prg * contrib/hbssl/tests/digest.prg * contrib/hbssl/tests/encode.prg * contrib/hbssl/tests/pem.prg * contrib/hbssl/tests/test.prg * contrib/hbtip/tests/base64.prg * contrib/hbtip/tests/dbtohtml.prg * contrib/hbtip/tests/dnldftp.prg * contrib/hbtip/tests/ftpadv.prg * contrib/hbtip/tests/gmail.prg * contrib/hbtip/tests/httpadv.prg * contrib/hbtip/tests/loadhtml.prg * contrib/hbtip/tests/test01.prg * contrib/hbtip/tests/tipmail.prg * contrib/hbtip/tests/tipmime.prg * contrib/hbtip/tests/tipmmail.prg * contrib/hbtip/tests/tiptest.prg * contrib/hbtip/tests/tiptime.prg * contrib/hbtip/tests/upld_ftp.prg * contrib/hbtpathy/tests/testtp.prg * contrib/hbunix/tests/testdmn.prg * contrib/hbunix/tests/testpid.prg * contrib/hbxdiff/tests/test.prg * contrib/hbxdiff/tests/test2.prg * contrib/hbxdiff/tests/test3.prg * contrib/rddsql/tests/arrayrdd.prg * contrib/sddsqlt3/tests/test1.prg * contrib/xhb/tests/compress.prg * contrib/xhb/tests/dll.prg * contrib/xhb/tests/testcp.prg * contrib/xhb/tests/xml1.prg + added #require directives, so the tests can now be run as scripts. It will require a dynamically built hbrun and contrib dlls. To make them, use: HB_BUILD_CONTRIB_DYN=yes and rebuild Harbour. * minor cleanups along the way ; RDDSQL fails in RDDSETDEFAULT(). * contrib/gtwvg/toolbar.prg ! fixed yet another != (disguised as <>) operator on string
2012-10-11 16:16:32 +00:00
parent 774377666f
commit 35b3abdcdc
74 changed files with 296 additions and 70 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,89 @@
   The license applies to all entries newer than 2009-04-28.
 */

+2012-10-11 18:07 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * contrib/hbblat/tests/blatcmd.prg
+  * contrib/hbblat/tests/blattest.prg
+  * contrib/hbbz2/tests/test.prg
+  * contrib/hbcomm/tests/test.prg
+  * contrib/hbcups/tests/test.prg
+  * contrib/hbexpat/tests/test.prg
+  * contrib/hbexpat/tests/tohash.prg
+  * contrib/hbfbird/tests/simple.prg
+  * contrib/hbfbird/tests/stress.prg
+  * contrib/hbfbird/tests/test.prg
+  * contrib/hbfimage/tests/fitest.prg
+  * contrib/hbgs/tests/testgs.prg
+  * contrib/hbhpdf/tests/harupdf.prg
+  * contrib/hblzf/tests/test.prg
+  * contrib/hbmagic/tests/hbmagit.prg
+  * contrib/hbmemio/tests/test.prg
+  * contrib/hbmxml/tests/custom.prg
+  * contrib/hbmxml/tests/reminder.prg
+  * contrib/hbmxml/tests/testmxml.prg
+  * contrib/hbmysql/tests/test.prg
+  * contrib/hbmzip/tests/myunzip.prg
+  * contrib/hbmzip/tests/myzip.prg
+  * contrib/hbodbc/tests/odbccall.prg
+  * contrib/hbodbc/tests/odbcdemo.prg
+  * contrib/hbodbc/tests/testodbc.prg
+  * contrib/hbpgsql/tests/async.prg
+  * contrib/hbpgsql/tests/cache.prg
+  * contrib/hbpgsql/tests/dbf2pg.prg
+  * contrib/hbpgsql/tests/simple.prg
+  * contrib/hbpgsql/tests/stress.prg
+  * contrib/hbpgsql/tests/test.prg
+  * contrib/hbsms/tests/send.prg
+  * contrib/hbsqlit3/tests/authoriz.prg
+  * contrib/hbsqlit3/tests/backup.prg
+  * contrib/hbsqlit3/tests/blob.prg
+  * contrib/hbsqlit3/tests/hdbctest.prg
+  * contrib/hbsqlit3/tests/hooks.prg
+  * contrib/hbsqlit3/tests/metadata.prg
+  * contrib/hbsqlit3/tests/pack.prg
+  * contrib/hbsqlit3/tests/sl3_test.prg
+  * contrib/hbssl/tests/bio.prg
+  * contrib/hbssl/tests/crypt.prg
+  * contrib/hbssl/tests/digest.prg
+  * contrib/hbssl/tests/encode.prg
+  * contrib/hbssl/tests/pem.prg
+  * contrib/hbssl/tests/test.prg
+  * contrib/hbtip/tests/base64.prg
+  * contrib/hbtip/tests/dbtohtml.prg
+  * contrib/hbtip/tests/dnldftp.prg
+  * contrib/hbtip/tests/ftpadv.prg
+  * contrib/hbtip/tests/gmail.prg
+  * contrib/hbtip/tests/httpadv.prg
+  * contrib/hbtip/tests/loadhtml.prg
+  * contrib/hbtip/tests/test01.prg
+  * contrib/hbtip/tests/tipmail.prg
+  * contrib/hbtip/tests/tipmime.prg
+  * contrib/hbtip/tests/tipmmail.prg
+  * contrib/hbtip/tests/tiptest.prg
+  * contrib/hbtip/tests/tiptime.prg
+  * contrib/hbtip/tests/upld_ftp.prg
+  * contrib/hbtpathy/tests/testtp.prg
+  * contrib/hbunix/tests/testdmn.prg
+  * contrib/hbunix/tests/testpid.prg
+  * contrib/hbxdiff/tests/test.prg
+  * contrib/hbxdiff/tests/test2.prg
+  * contrib/hbxdiff/tests/test3.prg
+  * contrib/rddsql/tests/arrayrdd.prg
+  * contrib/sddsqlt3/tests/test1.prg
+  * contrib/xhb/tests/compress.prg
+  * contrib/xhb/tests/dll.prg
+  * contrib/xhb/tests/testcp.prg
+  * contrib/xhb/tests/xml1.prg
+    + added #require directives, so the tests can now
+      be run as scripts. It will require a dynamically
+      built hbrun and contrib dlls. To make them, use:
+        HB_BUILD_CONTRIB_DYN=yes and rebuild Harbour.
+    * minor cleanups along the way
+    ; RDDSQL fails in RDDSETDEFAULT().
+
+  * contrib/gtwvg/toolbar.prg
+    ! fixed yet another != (disguised as <>) operator on string
+
 2012-10-11 16:32 UTC+0200 Viktor Szakats (harbour syenar.net)
  * contrib/hbamf/tests/tstendin.prg
    ! fixed infinite loop after one recent change
--- a/harbour/contrib/gtwvg/toolbar.prg
+++ b/harbour/contrib/gtwvg/toolbar.prg
@@ -337,7 +337,7 @@ METHOD WvgToolBar:addItem( cCaption, xImage, xDisabledImage, xHotImage, cDLL, nS
      ELSE
         nBtn := WAPI_ImageList_Add( ::hImageList, pBitmap )
      ENDIF
-      IF cType <> "P"
+      IF !( cType == "P" )
         WVG_DeleteObject( pBitmap )
      ENDIF

--- a/harbour/contrib/hbblat/tests/blatcmd.prg
+++ b/harbour/contrib/hbblat/tests/blatcmd.prg
@@ -50,6 +50,8 @@
 *
 */

+#require "hbblat"
+
 PROCEDURE Main()

   LOCAL cCmd := win_GetCommandLineParam()
--- a/harbour/contrib/hbblat/tests/blattest.prg
+++ b/harbour/contrib/hbblat/tests/blattest.prg
@@ -50,6 +50,7 @@
 *
 */

+#require "hbblat"

 #include "hbblat.ch"

@@ -70,37 +71,37 @@ PROCEDURE Main()

   oBlat:cFrom                   := ADDRESS_FROM
   oBlat:cTo                     := ADDRESS_TO
-   // oBlat:cUserAUTH               := "myaccount@mydomain.org"
-   // oBlat:cPasswordAUTH           := "mypassword"
-   // oBlat:cHostname               := "mail.anydomain.com"
-   // oBlat:cCC                     := ADDRESS_CC
-   // oBlat:cCCFile                 := "f_cc.txt"
-   // oBlat:cBCC                    := "info@fsgiudice.com"
-   // oBlat:cBCCFile                := "f_bcc.txt"
-   // oBlat:cBodyFile               := "c.bin"
+// oBlat:cUserAUTH               := "myaccount@mydomain.org"
+// oBlat:cPasswordAUTH           := "mypassword"
+// oBlat:cHostname               := "mail.anydomain.com"
+// oBlat:cCC                     := ADDRESS_CC
+// oBlat:cCCFile                 := "f_cc.txt"
+// oBlat:cBCC                    := "info@fsgiudice.com"
+// oBlat:cBCCFile                := "f_bcc.txt"
+// oBlat:cBodyFile               := "c.bin"
   oBlat:cBody                   := e"Body part\n\rEnd Body"
   oBlat:cServerSMTP             := SERVER_SMTP
   oBlat:cSubject                := "Test from Blat"
-   // oBlat:lSuppressSubject        := .T.
-   // oBlat:cSubjectFile            := "f_subjct.txt"
-   // oBlat:lToUndiscloseRecipients := .T.
+// oBlat:lSuppressSubject        := .T.
+// oBlat:cSubjectFile            := "f_subjct.txt"
+// oBlat:lToUndiscloseRecipients := .T.
   oBlat:cPostScriptumFile       := "f_ps.txt"
   oBlat:lRequestDisposition     := .T.          // does not work ???
   oBlat:lRequestReturnReceipt   := .T.

-   oBlat:cAttachTextFiles         := "f_subjct.txt"
-   oBlat:aAttachTextFiles         := { "f_ps.txt", "blattest.prg", "blatcmd.prg" }
-   oBlat:cAttachListTextFile      := "f_listtx.txt"
+   oBlat:cAttachTextFiles        := "f_subjct.txt"
+   oBlat:aAttachTextFiles        := { "f_ps.txt", "blattest.prg", "blatcmd.prg" }
+   oBlat:cAttachListTextFile     := "f_listtx.txt"

-   oBlat:cLogFile                 := "log.txt"
-   oBlat:lLogTimestamp            := .T.
-   oBlat:lDebug                   := .T.
-   oBlat:lLogOverwrite            := .T.
+   oBlat:cLogFile                := "log.txt"
+   oBlat:lLogTimestamp           := .T.
+   oBlat:lDebug                  := .T.
+   oBlat:lLogOverwrite           := .T.

-   // oBlat:lSuperDebug              := .T.     // This display internal checking
+// oBlat:lSuperDebug             := .T.     // This display internal checking

   ? "Checking options ..."
-   //oBlat:Check()
+// oBlat:Check()
   ?
   ? "Command .........: ", oBlat:GetCommand()  // Not necessary - this show complete command line sent to blat

--- a/harbour/contrib/hbbz2/tests/test.prg
+++ b/harbour/contrib/hbbz2/tests/test.prg
@@ -2,6 +2,8 @@
 * $Id$
 */

+#require "hbbz2"
+
 #include "simpleio.ch"

 PROCEDURE Main()
--- a/harbour/contrib/hbcomm/tests/test.prg
+++ b/harbour/contrib/hbcomm/tests/test.prg
@@ -12,6 +12,8 @@
 *
 */

+#require "hbcomm"
+
 STATIC s_nHandle
 STATIC s_lConnected := .F.

--- a/harbour/contrib/hbcups/tests/test.prg
+++ b/harbour/contrib/hbcups/tests/test.prg
@@ -2,6 +2,8 @@
 * $Id$
 */

+#require "hbcups"
+
 PROCEDURE Main()
   LOCAL i
   LOCAL aPrinter
--- a/harbour/contrib/hbexpat/tests/test.prg
+++ b/harbour/contrib/hbexpat/tests/test.prg
@@ -10,6 +10,8 @@
 *
 */

+#require "hbexpat"
+
 #include "hbexpat.ch"

 PROCEDURE Main( cFileName )
--- a/harbour/contrib/hbexpat/tests/tohash.prg
+++ b/harbour/contrib/hbexpat/tests/tohash.prg
@@ -11,6 +11,8 @@
 * See COPYING for licensing terms.
 */

+#require "hbexpat"
+
 #include "hbexpat.ch"

 #define _D_aTree            1
--- a/harbour/contrib/hbfbird/tests/simple.prg
+++ b/harbour/contrib/hbfbird/tests/simple.prg
@@ -2,6 +2,8 @@
 * $Id$
 */

+#require "hbfbird"
+
 #include "simpleio.ch"

 PROCEDURE Main()
--- a/harbour/contrib/hbfbird/tests/stress.prg
+++ b/harbour/contrib/hbfbird/tests/stress.prg
@@ -4,6 +4,8 @@

 /* VERY IMPORTANT: Don't use this query as sample, they are used for stress tests !!! */

+#require "hbfbird"
+
 #include "simpleio.ch"

 PROCEDURE Main()
--- a/harbour/contrib/hbfbird/tests/test.prg
+++ b/harbour/contrib/hbfbird/tests/test.prg
@@ -2,6 +2,8 @@
 * $Id$
 */

+#require "hbfbird"
+
 #include "simpleio.ch"

 PROCEDURE Main()
--- a/harbour/contrib/hbfimage/tests/fitest.prg
+++ b/harbour/contrib/hbfimage/tests/fitest.prg
@@ -8,6 +8,8 @@
 * FreeImage API test file
 */

+#require "hbfimage"
+
 #include "freeimag.ch"

 #include "fileio.ch"
@@ -148,51 +150,51 @@ PROCEDURE Main()
   ? "Create ERROR     :"
   ? "Save GIF ?       :", fi_Save( FIF_GIF, im, IMAGES_OUT + "wrong.gif", 0 )

-   //? ValToPrg( fi_GetInfoHeader( im ) )
-   //bmpinfoheader:Buffer( fi_GetInfoHeader( im ), .T. )
-   //bmpinfoheader:Pointer( fi_GetInfoHeader( im ) )
-   //? "Header           :", ValToPrg( bmpinfoheader )
-   //? bmpinfoheader:SayMembers(" ", .T., .T. )
+// ? ValToPrg( fi_GetInfoHeader( im ) )
+// bmpinfoheader:Buffer( fi_GetInfoHeader( im ), .T. )
+// bmpinfoheader:Pointer( fi_GetInfoHeader( im ) )
+// ? "Header           :", ValToPrg( bmpinfoheader )
+// ? bmpinfoheader:SayMembers(" ", .T., .T. )

   //bmpinfo:Pointer( fi_GetInfo( im ) )
   bmpinfo := NIL // To fix warning
   ? "Info           :", ValToPrg( bmpinfo )
-   //? bmpinfo:SayMembers(" ", .T., .T. )
+// ? bmpinfo:SayMembers(" ", .T., .T. )
   ? "-----------------------------------------------------"
-   //? ValType( bmpinfo:Devalue() )
-   //Tracelog( "bmpinfoheader", ValToPrg( bmpinfoheader ), ;
-   //          bmpinfoheader:SayMembers(, .T.), bmpinfoheader:Value(), bmpinfoheader:DeValue(), hb_dumpvar( bmpinfoheader:Array() ), hb_dumpvar( bmpinfoheader:acMembers ) )
+// ? ValType( bmpinfo:Devalue() )
+// Tracelog( "bmpinfoheader", ValToPrg( bmpinfoheader ), ;
+// infoheader:SayMembers(, .T.), bmpinfoheader:Value(), bmpinfoheader:DeValue(), hb_dumpvar( bmpinfoheader:Array() ), hb_dumpvar( bmpinfoheader:acMembers ) )

-   //appo := bkcolor:Value()
-   //? bkcolor:Pointer( fi_GetBackgroundColor( im ) )
-   //? fi_GetBackgroundColor( im, @bkcolor:Value() )
-   //bkcolor:Buffer( appo )
-   //? bkcolor:SayMembers( " ", .T., .T. )
+// appo := bkcolor:Value()
+// ? bkcolor:Pointer( fi_GetBackgroundColor( im ) )
+// ? fi_GetBackgroundColor( im, @bkcolor:Value() )
+// bkcolor:Buffer( appo )
+// ? bkcolor:SayMembers( " ", .T., .T. )

-   //bkcolor:rgbBlue := 205
-   //? fi_SetBackgroundColor( im, hb_String2Pointer( bkcolor:Value() ) )
+// bkcolor:rgbBlue := 205
+// ? fi_SetBackgroundColor( im, hb_String2Pointer( bkcolor:Value() ) )
   Tracelog( "line 168" )
-   //? fi_SetBackgroundColor( im, bkcolor:Value() )
+// ? fi_SetBackgroundColor( im, bkcolor:Value() )
   Tracelog( "line 170" )
-   //? bkcolor:SayMembers( " ", .T., .T. )
+// ? bkcolor:SayMembers( " ", .T., .T. )
   Tracelog( "line 162" )
-   //? bkcolor:Pointer( fi_GetBackgroundColor( im ) )
-   //? fi_GetBackgroundColor( im, @bkcolor:Value() )
-   //bkcolor:Buffer( appo )
+// ? bkcolor:Pointer( fi_GetBackgroundColor( im ) )
+// ? fi_GetBackgroundColor( im, @bkcolor:Value() )
+// bkcolor:Buffer( appo )
   Tracelog( "line 176" )
-   //? bkcolor:SayMembers( " ", .T., .T. )
+// ? bkcolor:SayMembers( " ", .T., .T. )

   Tracelog( "line 179" )
-   //iccprofile:Pointer( fi_GetICCProfile( im ) )
+// iccprofile:Pointer( fi_GetICCProfile( im ) )
   Tracelog( "line 181" )
-   //? "Header           :", ValToPrg( iccprofile )
+// ? "Header           :", ValToPrg( iccprofile )
   Tracelog( "line 183" )
-   //? iccprofile:SayMembers( " ", .T., .T. )
+// ? iccprofile:SayMembers( " ", .T., .T. )

-   //bmpinfoheader:Reset()
-   //appo := NIL
-   //bmpinfoheader := NIL
-   //hb_GCAll( .T. )
+// bmpinfoheader:Reset()
+// appo := NIL
+// bmpinfoheader := NIL
+// hb_GCAll( .T. )

   ? "Unload images from memory"
   fi_Unload( im )
--- a/harbour/contrib/hbgs/tests/testgs.prg
+++ b/harbour/contrib/hbgs/tests/testgs.prg
@@ -10,6 +10,8 @@
 *
 */

+#require "hbgs"
+
 #include "simpleio.ch"

 PROCEDURE Main()
--- a/harbour/contrib/hbhpdf/tests/harupdf.prg
+++ b/harbour/contrib/hbhpdf/tests/harupdf.prg
@@ -47,6 +47,8 @@
 *
 */

+#require "hbhpdf"
+
 #include "harupdf.ch"

 //
--- a/harbour/contrib/hblzf/tests/test.prg
+++ b/harbour/contrib/hblzf/tests/test.prg
@@ -2,6 +2,8 @@
 * $Id$
 */

+#require "hblzf"
+
 #include "simpleio.ch"

 #include "hblzf.ch"
--- a/harbour/contrib/hbmagic/tests/hbmagit.prg
+++ b/harbour/contrib/hbmagic/tests/hbmagit.prg
@@ -50,6 +50,8 @@
 *
 */

+#require "hbmagic"
+
 #include "hbmagic.ch"
 #include "simpleio.ch"

--- a/harbour/contrib/hbmemio/tests/test.prg
+++ b/harbour/contrib/hbmemio/tests/test.prg
@@ -2,19 +2,22 @@
 * $Id$
 */

+#require "hbmemio"
+
 REQUEST HB_MEMIO

-PROC Main()
+PROCEDURE Main()
+
   LOCAL nI
   FIELD F1

-   DBCREATE("mem:test", {{"F1", "N", 9, 0}},, .T., "memarea")
+   dbCreate( "mem:test", { { "F1", "N", 9, 0 } }, , .T., "memarea" )
   FOR nI := 1 TO 1000
-     DBAPPEND();  F1 := HB_RANDOM() * 1000000
+      dbAppend();  F1 := hb_Random() * 1000000
   NEXT
   INDEX ON F1 TAG f1
-   DBEVAL({|| QOUT(F1)})
-   DBCLOSEAREA()
-   DBDROP("mem:test")  // Free memory resource
+   dbEval( {|| QOut( F1 ) } )
+   dbCloseArea()
+   dbDrop( "mem:test" )  // Free memory resource

   RETURN
--- a/harbour/contrib/hbmxml/tests/custom.prg
+++ b/harbour/contrib/hbmxml/tests/custom.prg
@@ -2,6 +2,8 @@
 * $Id$
 */

+#require "hbmxml"
+
 #xtranslate _ENCODE( <xData> ) => ( hb_base64encode( hb_serialize( mxmlGetCustom( <xData> ) ) ) )

 #include "hbmxml.ch"
--- a/harbour/contrib/hbmxml/tests/reminder.prg
+++ b/harbour/contrib/hbmxml/tests/reminder.prg
@@ -2,6 +2,8 @@
 * $Id$
 */

+#require "hbmxml"
+
 #include "hbmxml.ch"

 STATIC s_mxml_error := .F.
--- a/harbour/contrib/hbmxml/tests/testmxml.prg
+++ b/harbour/contrib/hbmxml/tests/testmxml.prg
@@ -19,6 +19,8 @@
 *
 */

+#require "hbmxml"
+
 #include "hbmxml.ch"
 #include "simpleio.ch"

--- a/harbour/contrib/hbmysql/tests/test.prg
+++ b/harbour/contrib/hbmysql/tests/test.prg
@@ -50,6 +50,8 @@
 *
 */

+#require "hbmysql"
+
 #include "dbstruct.ch"

 PROCEDURE Main( cArg )
--- a/harbour/contrib/hbmzip/tests/myunzip.prg
+++ b/harbour/contrib/hbmzip/tests/myunzip.prg
@@ -50,6 +50,8 @@
 *
 */

+#require "hbmzip"
+
 PROCEDURE Main( ... )

   LOCAL hUnzip, aWild, cFileName, cExt, cPath, cFile, ;
--- a/harbour/contrib/hbmzip/tests/myzip.prg
+++ b/harbour/contrib/hbmzip/tests/myzip.prg
@@ -50,6 +50,8 @@
 *
 */

+#require "hbmzip"
+
 PROCEDURE Main( ... )

   LOCAL hZip, aDir, aFile, aWild, ;
--- a/harbour/contrib/hbodbc/tests/odbccall.prg
+++ b/harbour/contrib/hbodbc/tests/odbccall.prg
@@ -2,6 +2,8 @@
 * $Id$
 */

+#require "hbodbc"
+
 #include "simpleio.ch"

 PROCEDURE Main()
--- a/harbour/contrib/hbodbc/tests/odbcdemo.prg
+++ b/harbour/contrib/hbodbc/tests/odbcdemo.prg
@@ -2,6 +2,8 @@
 * $Id$
 */

+#require "hbodbc"
+
 #include "simpleio.ch"

 PROCEDURE Main()
--- a/harbour/contrib/hbodbc/tests/testodbc.prg
+++ b/harbour/contrib/hbodbc/tests/testodbc.prg
@@ -2,6 +2,8 @@
 * $Id$
 */

+#require "hbodbc"
+
 #include "simpleio.ch"

 #include "sql.ch"
--- a/harbour/contrib/hbpgsql/tests/async.prg
+++ b/harbour/contrib/hbpgsql/tests/async.prg
@@ -6,6 +6,8 @@
 * This sample show howto use asynchronous/nonblocking queries
 */

+#require "hbpgsql"
+
 #include "inkey.ch"

 PROCEDURE Main( cServer, cDatabase, cUser, cPass )
--- a/harbour/contrib/hbpgsql/tests/cache.prg
+++ b/harbour/contrib/hbpgsql/tests/cache.prg
@@ -6,6 +6,8 @@
 * This samples show how to use dbf to cache postgres records.
 */

+#require "hbpgsql"
+
 #include "postgres.ch"

 #define DB_ALIAS                        1
--- a/harbour/contrib/hbpgsql/tests/dbf2pg.prg
+++ b/harbour/contrib/hbpgsql/tests/dbf2pg.prg
@@ -51,6 +51,8 @@
 *
 */

+#require "hbpgsql"
+
 #include "inkey.ch"
 #include "fileio.ch"

--- a/harbour/contrib/hbpgsql/tests/simple.prg
+++ b/harbour/contrib/hbpgsql/tests/simple.prg
@@ -2,6 +2,8 @@
 * $Id$
 */

+#require "hbpgsql"
+
 PROCEDURE Main( cHost, cDatabase, cUser, cPass )
   LOCAL oServer, oQuery, oRow, i, x, aTables, aStruct

--- a/harbour/contrib/hbpgsql/tests/stress.prg
+++ b/harbour/contrib/hbpgsql/tests/stress.prg
@@ -6,6 +6,8 @@
 * VERY IMPORTANT: Don't use this querys as sample, they are used for stress tests !!!
 */

+#require "hbpgsql"
+
 #include "postgres.ch"

 PROCEDURE Main( cServer, cDatabase, cUser, cPass )
--- a/harbour/contrib/hbpgsql/tests/test.prg
+++ b/harbour/contrib/hbpgsql/tests/test.prg
@@ -2,6 +2,8 @@
 * $Id$
 */

+#require "hbpgsql"
+
 #include "postgres.ch"

 PROCEDURE main()
--- a/harbour/contrib/hbsms/tests/send.prg
+++ b/harbour/contrib/hbsms/tests/send.prg
@@ -7,6 +7,8 @@
 * www - http://www.harbour-project.org
 */

+#require "hbsms"
+
 PROCEDURE Main( cPort )

 #if   defined( __PLATFORM__WINDOWS )
--- a/harbour/contrib/hbsqlit3/tests/authoriz.prg
+++ b/harbour/contrib/hbsqlit3/tests/authoriz.prg
@@ -76,6 +76,8 @@
 * that contain additional details about the action to be authorized.
 */

+#require "hbsqlit3"
+
 #include "hbsqlit3.ch"

 PROCEDURE main()
--- a/harbour/contrib/hbsqlit3/tests/backup.prg
+++ b/harbour/contrib/hbsqlit3/tests/backup.prg
@@ -64,6 +64,8 @@
 *                       with the backup operation.
 */

+#require "hbsqlit3"
+
 #include "hbsqlit3.ch"

 PROCEDURE main()
--- a/harbour/contrib/hbsqlit3/tests/blob.prg
+++ b/harbour/contrib/hbsqlit3/tests/blob.prg
@@ -50,6 +50,8 @@
 *
 */

+#require "hbsqlit3"
+
 #include "hbsqlit3.ch"

 #define TABLE_SQL "CREATE TABLE image( id INTEGER PRIMARY KEY AUTOINCREMENT, title TEXT(50), image BLOB )"
--- a/harbour/contrib/hbsqlit3/tests/hdbctest.prg
+++ b/harbour/contrib/hbsqlit3/tests/hdbctest.prg
@@ -2,6 +2,8 @@
 * $Id$
 */

+#require "hbsqlit3"
+
 PROCEDURE Main()

   LOCAL oConn, oMeta, oStmt, cSql, n, oRs
--- a/harbour/contrib/hbsqlit3/tests/hooks.prg
+++ b/harbour/contrib/hbsqlit3/tests/hooks.prg
@@ -50,6 +50,8 @@
 *
 */

+#require "hbsqlit3"
+
 #include "hbsqlit3.ch"

 PROCEDURE main()
--- a/harbour/contrib/hbsqlit3/tests/metadata.prg
+++ b/harbour/contrib/hbsqlit3/tests/metadata.prg
@@ -50,6 +50,8 @@
 *
 */

+#require "hbsqlit3"
+
 #include "hbsqlit3.ch"

 //#define SQLITE_ENABLE_COLUMN_METADATA
--- a/harbour/contrib/hbsqlit3/tests/pack.prg
+++ b/harbour/contrib/hbsqlit3/tests/pack.prg
@@ -50,6 +50,8 @@
 *
 */

+#require "hbsqlit3"
+
 #include "hbsqlit3.ch"

 PROCEDURE main()
--- a/harbour/contrib/hbsqlit3/tests/sl3_test.prg
+++ b/harbour/contrib/hbsqlit3/tests/sl3_test.prg
@@ -50,6 +50,8 @@
 *
 */

+#require "hbsqlit3"
+
 #include "hbsqlit3.ch"

 #define TRACE
--- a/harbour/contrib/hbssl/tests/bio.prg
+++ b/harbour/contrib/hbssl/tests/bio.prg
@@ -7,6 +7,8 @@
 * www - http://harbour-project.org
 */

+#require "hbssl"
+
 #include "simpleio.ch"

 #include "hbssl.ch"
--- a/harbour/contrib/hbssl/tests/crypt.prg
+++ b/harbour/contrib/hbssl/tests/crypt.prg
@@ -7,6 +7,8 @@
 * www - http://harbour-project.org
 */

+#require "hbssl"
+
 #include "simpleio.ch"

 #include "hbssl.ch"
--- a/harbour/contrib/hbssl/tests/digest.prg
+++ b/harbour/contrib/hbssl/tests/digest.prg
@@ -7,6 +7,8 @@
 * www - http://harbour-project.org
 */

+#require "hbssl"
+
 #include "simpleio.ch"

 #include "hbssl.ch"
--- a/harbour/contrib/hbssl/tests/encode.prg
+++ b/harbour/contrib/hbssl/tests/encode.prg
@@ -7,6 +7,8 @@
 * www - http://harbour-project.org
 */

+#require "hbssl"
+
 #include "simpleio.ch"

 #include "hbssl.ch"
--- a/harbour/contrib/hbssl/tests/pem.prg
+++ b/harbour/contrib/hbssl/tests/pem.prg
@@ -7,6 +7,8 @@
 * www - http://harbour-project.org
 */

+#require "hbssl"
+
 #include "simpleio.ch"

 #include "hbssl.ch"
@@ -76,4 +78,3 @@ STATIC FUNCTION cb_function( lWrite )
 STATIC FUNCTION Output( ... )
   ? ...
   RETURN NIL
-
--- a/harbour/contrib/hbssl/tests/test.prg
+++ b/harbour/contrib/hbssl/tests/test.prg
@@ -7,6 +7,8 @@
 * www - http://harbour-project.org
 */

+#require "hbssl"
+
 #include "simpleio.ch"

 #include "hbssl.ch"
--- a/harbour/contrib/hbtip/tests/base64.prg
+++ b/harbour/contrib/hbtip/tests/base64.prg
@@ -11,12 +11,14 @@
 * input/output file against other OS encoded/decoded data
 *
 * Usage:
-* base64test < file-to-encode >encoded-file
-* base64test -d  < encoded-file  >file-to-decode
-* base64test -q [-d]  to use quoted printable encoding/decoding.
-* base64test -u [-d]  to use url encoding/decoding.
+* base64 < file-to-encode >encoded-file
+* base64 -d  < encoded-file  >file-to-decode
+* base64 -q [-d]  to use quoted printable encoding/decoding.
+* base64 -u [-d]  to use url encoding/decoding.
 *****/

+#require "hbtip"
+
 #define hSTDIN 0
 #define hSTDOUT 1

--- a/harbour/contrib/hbtip/tests/dbtohtml.prg
+++ b/harbour/contrib/hbtip/tests/dbtohtml.prg
@@ -7,6 +7,8 @@
 * creating a HTML document.
 */

+#require "hbtip"
+
 PROCEDURE Main

   LOCAL oDoc, oNode, oTable, oRow, oCell
--- a/harbour/contrib/hbtip/tests/dnldftp.prg
+++ b/harbour/contrib/hbtip/tests/dnldftp.prg
@@ -6,6 +6,8 @@
 * Download an file from an ftp server
 */

+#require "hbtip"
+
 PROCEDURE Main( cFile )

   ? TRP20FTPEnv( cFile )
--- a/harbour/contrib/hbtip/tests/ftpadv.prg
+++ b/harbour/contrib/hbtip/tests/ftpadv.prg
@@ -7,6 +7,8 @@
 * FTP Advanced operations Test
 ******************************************/

+#require "hbtip"
+
 PROCEDURE Main( cUrl )

   LOCAL oCon, oUrl
--- a/harbour/contrib/hbtip/tests/gmail.prg
+++ b/harbour/contrib/hbtip/tests/gmail.prg
@@ -7,6 +7,8 @@
 * www - http://harbour-project.org
 */

+#require "hbtip"
+
 #include "simpleio.ch"

 PROCEDURE Main( cFrom, cPassword, cTo )
--- a/harbour/contrib/hbtip/tests/httpadv.prg
+++ b/harbour/contrib/hbtip/tests/httpadv.prg
@@ -7,6 +7,8 @@
 * HTTP Advanced operations Test
 ******************************************/

+#require "hbtip"
+
 PROCEDURE Main( cUrl )

   LOCAL oCon, oUrl, i
--- a/harbour/contrib/hbtip/tests/loadhtml.prg
+++ b/harbour/contrib/hbtip/tests/loadhtml.prg
@@ -6,6 +6,8 @@
 * Sends a query to Google and displays the Links from the response HTML page
 */

+#require "hbtip"
+
 PROCEDURE Main

   LOCAL oHttp, cHtml, hQuery, aLink, oNode, oDoc
--- a/harbour/contrib/hbtip/tests/test01.prg
+++ b/harbour/contrib/hbtip/tests/test01.prg
@@ -2,6 +2,8 @@
 * $Id$
 */

+#require "hbtip"
+
 PROCEDURE Main()

   LOCAL oHttp
--- a/harbour/contrib/hbtip/tests/tipmail.prg
+++ b/harbour/contrib/hbtip/tests/tipmail.prg
@@ -14,6 +14,8 @@
 * compiled only under GTCGI;
 ******************************************/

+#require "hbtip"
+
 PROCEDURE Main( cFileName )

   LOCAL oMail, cData, i
--- a/harbour/contrib/hbtip/tests/tipmime.prg
+++ b/harbour/contrib/hbtip/tests/tipmime.prg
@@ -9,9 +9,10 @@
 * This test tries to detect the mime type of a give file.
 *
 * Usage:
- * mimetest filename
+ * tipmime filename
 ******************************************/

+#require "hbtip"

 PROCEDURE Main( cFileName )

--- a/harbour/contrib/hbtip/tests/tipmmail.prg
+++ b/harbour/contrib/hbtip/tests/tipmmail.prg
@@ -11,7 +11,7 @@
 * the set of files given in the command line.
 *
 * Usage:
- * testmmail [options] attachment1, attachment2...
+ * tipmmail [options] attachment1, attachment2...
 *  options:
 *    -h              Help
 *    -f "from"       Set "mail from" field
@@ -25,6 +25,8 @@
 * compiled only under GTCGI;
 ******************************************/

+#require "hbtip"
+
 PROCEDURE Main( ... )

   LOCAL oMail, cData, i, oAttach
--- a/harbour/contrib/hbtip/tests/tiptest.prg
+++ b/harbour/contrib/hbtip/tests/tiptest.prg
@@ -46,6 +46,8 @@
 *      it will be sent instead of being retrieved.
 *****************************************************/

+#require "hbtip"
+
 #include "hbclass.ch"
 #include "tip.ch"

--- a/harbour/contrib/hbtip/tests/tiptime.prg
+++ b/harbour/contrib/hbtip/tests/tiptime.prg
@@ -7,6 +7,8 @@
 * www - http://harbour-project.org
 */

+#require "hbtip"
+
 #include "simpleio.ch"

 PROCEDURE Main()
--- a/harbour/contrib/hbtip/tests/upld_ftp.prg
+++ b/harbour/contrib/hbtip/tests/upld_ftp.prg
@@ -7,6 +7,8 @@
 * Send an file or list of files to ftp server
 */

+#require "hbtip"
+
 #include "directry.ch"

 PROCEDURE Main( cMask )
--- a/harbour/contrib/hbtpathy/tests/testtp.prg
+++ b/harbour/contrib/hbtpathy/tests/testtp.prg
@@ -66,6 +66,8 @@
    com port.
 */

+#require "hbtpathy"
+
 PROCEDURE Main()
   ? tp_open( 1,,, 9600, 8, "N", 1 )
   tp_send( 1, "Hi there Bob", 1 )    // One second timeout
--- a/harbour/contrib/hbunix/tests/testdmn.prg
+++ b/harbour/contrib/hbunix/tests/testdmn.prg
@@ -10,6 +10,8 @@
 *
 */

+#require "hbunix"
+
 REQUEST HB_GT_CGI_DEFAULT

 PROCEDURE Main()
--- a/harbour/contrib/hbunix/tests/testpid.prg
+++ b/harbour/contrib/hbunix/tests/testpid.prg
@@ -10,6 +10,8 @@
 *
 */

+#require "hbunix"
+
 #include "simpleio.ch"

 PROCEDURE Main()
--- a/harbour/contrib/hbxdiff/tests/test.prg
+++ b/harbour/contrib/hbxdiff/tests/test.prg
@@ -2,7 +2,10 @@
 * $Id$
 */

+#require "hbxdiff"
+
 #include "hbxdiff.ch"
+
 #include "simpleio.ch"

 #define _SIZE 62
@@ -12,7 +15,7 @@ PROCEDURE main()
   LOCAL cFileCtx
   LOCAL nSize

-   pMMF  := xdl_init_mmfile( XDLT_STD_BLKSIZE, XDL_MMF_ATOMIC )
+   pMMF := xdl_init_mmfile( XDLT_STD_BLKSIZE, XDL_MMF_ATOMIC )
   ? xdl_mmfile_size( pMMF )
   ? xdl_mmfile_iscompact( pMMF )

--- a/harbour/contrib/hbxdiff/tests/test2.prg
+++ b/harbour/contrib/hbxdiff/tests/test2.prg
@@ -2,7 +2,10 @@
 * $Id$
 */

+#require "hbxdiff"
+
 #include "hbxdiff.ch"
+
 #include "fileio.ch"
 #include "simpleio.ch"

@@ -16,7 +19,7 @@ PROCEDURE main()
   pMMFOld := xdl_init_mmfile( XDLT_STD_BLKSIZE )
   pMMFNew := xdl_init_mmfile( XDLT_STD_BLKSIZE, XDL_MMF_ATOMIC )

-   cFileCtx := hb_memoRead( __FILE__ )
+   cFileCtx := hb_MemoRead( __FILE__ )

   xdl_write_mmfile( pMMFOld, @cFileCtx )
   xdl_write_mmfile( pMMFNew, cFileCtx + hb_eol() + Space( 3 ) + "RETURN NIL" + hb_eol() )
@@ -26,7 +29,7 @@ PROCEDURE main()
   hb_FNameSplit( __FILE__, NIL, @cDiffName, NIL )
   cDiffName := hb_FNameMerge( NIL, cDiffName, ".dif" )

-   hDif := FCreate( cDiffName , FC_NORMAL )
+   hDif := FCreate( cDiffName, FC_NORMAL )
   IF FError() == 0
      FWrite( hDif, "diff ---" + hb_eol() )
      xdl_diff( pMMFOld, pMMFNew, 0, 3, hDif )
--- a/harbour/contrib/hbxdiff/tests/test3.prg
+++ b/harbour/contrib/hbxdiff/tests/test3.prg
@@ -2,9 +2,10 @@
 * $Id$
 */

+#require "hbxdiff"
+
 #include "hbxdiff.ch"

-#include "fileio.ch"
 #include "simpleio.ch"

 FUNCTION Diff( ... )
@@ -12,7 +13,7 @@ FUNCTION Diff( ... )
   LOCAL e

   FOR EACH e IN { ... }
-      OutStd( e )
+      ? e
   NEXT

   RETURN 0
--- a/harbour/contrib/rddsql/tests/arrayrdd.prg
+++ b/harbour/contrib/rddsql/tests/arrayrdd.prg
@@ -2,6 +2,8 @@
 * $Id$
 */

+#require "rddsql"
+
 REQUEST SQLMIX

 PROCEDURE Main()
--- a/harbour/contrib/sddsqlt3/tests/test1.prg
+++ b/harbour/contrib/sddsqlt3/tests/test1.prg
@@ -2,6 +2,8 @@
 * $Id$
 */

+#require "sddsqlt3"
+
 #include "simpleio.ch"
 #include "hbrddsql.ch"

--- a/harbour/contrib/xhb/tests/compress.prg
+++ b/harbour/contrib/xhb/tests/compress.prg
@@ -7,6 +7,8 @@
 //
 // Giancarlo Niccolai

+#require "xhb"
+
 #include "hbcomprs.ch"

 PROCEDURE Main()
@@ -27,7 +29,7 @@ PROCEDURE Main()
   cDecomp := HB_Uncompress( nBuflen, cComp )

   @ 3, 7 SAY "Uncompressed: (" + hb_ntos( Len( cText ) ) + ")" + cText + "<<"
-   @ 4, 7 SAY "Compressed (" + hb_ntos( Len( cComp ) ) + ")" + cComp + "<<"
+   @ 4, 7 SAY "Compressed (" + hb_ntos( Len( cComp ) ) + ")" + hb_StrToHex( cComp ) + "<<"
   @ 5, 7 SAY "Decompressed: (" + hb_ntos( Len( cDecomp ) ) + ")" + cDecomp + "<<"

   @ 7, 5 SAY "TEST 2: using preallocated buffers"
@@ -42,7 +44,7 @@ PROCEDURE Main()
   HB_Uncompress( Len( cText ), cComp, nBuflen , @cDecomp )

   @ 8, 7 SAY "Uncompressed: (" + hb_ntos( Len( cText ) ) + ")" + cText + "<<"
-   @ 9, 7 SAY "Compressed (" + hb_ntos( nBuflen ) + ")" + cComp + "<<"
+   @ 9, 7 SAY "Compressed (" + hb_ntos( nBuflen ) + ")" + hb_StrToHex( cComp ) + "<<"
   // Notice: this time the lenght of the destination buffer is not the lenght of
   // the original buffer, but Int(nBufLen * 1.1)
   @ 10, 7 SAY "Decompressed: (" + hb_ntos( Len( cDecomp ) ) + ")" + cDecomp + "<<"
--- a/harbour/contrib/xhb/tests/dll.prg
+++ b/harbour/contrib/xhb/tests/dll.prg
@@ -2,6 +2,8 @@
 * $Id$
 */

+#require "xhb"
+
 #include "hbdll.ch"

 IMPORT STATIC MessageBox( hWnd, cMsg, cText, nFlags ) FROM user32.dll EXPORTED AS MessageBoxA
--- a/harbour/contrib/xhb/tests/testcp.prg
+++ b/harbour/contrib/xhb/tests/testcp.prg
@@ -2,6 +2,8 @@
 * $Id$
 */

+#require "xhb"
+
 PROCEDURE Main()

   XHB_COPYFILE( "testcp.prg", "testcp.bak", {| x | QOut( x ) } )
--- a/harbour/contrib/xhb/tests/xml1.prg
+++ b/harbour/contrib/xhb/tests/xml1.prg
@@ -2,6 +2,8 @@
 * $Id$
 */

+#require "xhb"
+
 #include "hbxml.ch"

 PROCEDURE Main()