fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-07-16 13:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbtest/hbtest.prg
  * utils/hbtest/rt_hvm.prg
  * utils/hbtest/rt_hvma.prg
  * utils/hbtest/rt_stra.prg
  * utils/hbtest/rt_vars.ch
    - Disabled long string tests for vxworks. They fail because of
      memory exhaustion.
    ! Fixes to prev.
    ; Now hbtest runs OK on vxworks/gcc.

  * config/global.mk
    + Now defines __PLATFORM__VXWORKS for cross-builds.
    ! Fixed typo in lastly added __PLATFORM__ redefinition.

  * INSTALL
    + Added vxworks/diab example.
This commit is contained in:
Viktor Szakats
2010-07-16 11:59:29 +00:00
parent 03a15d50b5
commit df891b8377
8 changed files with 48 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
harbour/ChangeLog
View File

@@ -16,6 +16,24 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-07-16 13:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbtest/hbtest.prg
* utils/hbtest/rt_hvm.prg
* utils/hbtest/rt_hvma.prg
* utils/hbtest/rt_stra.prg
* utils/hbtest/rt_vars.ch
- Disabled long string tests for vxworks. They fail because of
memory exhaustion.
! Fixes to prev.
; Now hbtest runs OK on vxworks/gcc.
* config/global.mk
+ Now defines __PLATFORM__VXWORKS for cross-builds.
! Fixed typo in lastly added __PLATFORM__ redefinition.
* INSTALL
+ Added vxworks/diab example.
2010-07-16 13:27 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbtest/hbtest.prg
* utils/hbtest/rt_hvm.prg

10
harbour/INSTALL
View File

@@ -929,13 +929,13 @@ HARBOUR
win-make
---
--- VxWorks 6.8 x86 (requires preceding build for Windows target)
--- VxWorks GCC x86 (requires preceding build for Windows target)
wrenv -p vxworks-6.8
set HB_COMPILER=gcc
win-make
---
--- VxWorks 6.8 ARM (requires preceding build for Windows target)
--- VxWorks GCC ARM (requires preceding build for Windows target)
wrenv -p vxworks-6.8
set HB_COMPILER=gcc
set HB_CPU=arm
@@ -943,6 +943,12 @@ HARBOUR
win-make
---
--- VxWorks Wind River Compiler x86 (requires preceding build for Windows target)
wrenv -p vxworks-6.8
set HB_COMPILER=diab
win-make
---
--8<--
rem ; Add these *before* above sample scripts to configure 3rd party dependencies.
rem When using MSYS or Cygwin shell you'll have to use forward slashes and

7
harbour/config/global.mk
View File

@@ -1336,9 +1336,14 @@ ifneq ($(HB_HOST_PLAT)$(HB_HOST_CPU),$(HB_PLATFORM)$(HB_CPU))
else
ifeq ($(HB_PLATFORM),beos)
HB_PRGFLAGS += -D__PLATFORM__BEOS -D__PLATFORM__UNIX
endif
else
ifeq ($(HB_PLATFORM),qnx)
HB_PRGFLAGS += -D__PLATFORM__QNX -D__PLATFORM__UNIX
else
ifeq ($(HB_PLATFORM),vxworks)
HB_PRGFLAGS += -D__PLATFORM__VXWORKS -D__PLATFORM__UNIX
endif
endif
endif
endif
endif

18
harbour/utils/hbtest/hbtest.prg
View File

@@ -90,6 +90,7 @@ STATIC s_lShortcut
STATIC s_aSkipList
STATIC s_nStartTime
STATIC s_nEndTime
STATIC s_lDBFAvail := .F.
#ifdef __HARBOUR__
REQUEST HB_LANG_EN
@@ -140,8 +141,10 @@ PROCEDURE Main( cPar1, cPar2 )
Exact_Str()
New_STRINGS()
#ifdef __HARBOUR__
#ifndef __PLATFORM__VXWORKS
Long_STRINGS()
#endif
#endif
#ifdef __XPP__
Long_STRINGS()
#endif
@@ -267,8 +270,6 @@ STATIC PROCEDURE TEST_BEGIN( cParam )
PUBLIC mbBlockC := sbBlockC
PUBLIC maArray := { 9898 }
PUBLIC lDBFAvail := .F.
#ifndef __XPP__
//rddSetDefault( "DBFCDX" )
#endif
@@ -306,16 +307,19 @@ STATIC PROCEDURE TEST_BEGIN( cParam )
w_TEST->TYPE_L := .T.
w_TEST->TYPE_L_E := .F.
lDBFAvail := .T.
s_lDBFAvail := .T.
END SEQUENCE
ErrorBlock( bErrorOld )
IF ! lDBFAvail
IF ! s_lDBFAvail
OutMsg( s_nFhnd, "WARNING ! Test .dbf could not be created. Related tests will be skipped." + HB_OSNewLine() )
ENDIF
RETURN
FUNCTION TEST_DBFAvail()
RETURN s_lDBFAvail
PROCEDURE TEST_CALL( cBlock, bBlock, xResultExpected )
LOCAL xResult
LOCAL oError
@@ -402,9 +406,9 @@ FUNCTION TEST_OPT_Z()
STATIC PROCEDURE TEST_END()
dbSelectArea( "w_TEST" )
dbCloseArea()
IF lDBFAvail
IF s_lDBFAvail
dbSelectArea( "w_TEST" )
dbCloseArea()
FErase( "_hbtmp_.dbf" )
FErase( "_hbtmp_.dbt" )
ENDIF

4
harbour/utils/hbtest/rt_hvm.prg
View File

@@ -79,7 +79,7 @@ PROCEDURE Main_HVM()
TEST_LINE( ValType( sbBlock ) , "B" )
TEST_LINE( ValType( saArray ) , "A" )
TEST_LINE( ValType( { 1, 2, 3 } ) , "A" )
IF lDBFAvail
IF TEST_DBFAvail()
TEST_LINE( ValType( w_TEST->TYPE_C ) , "C" )
TEST_LINE( ValType( w_TEST->TYPE_D ) , "D" )
TEST_LINE( ValType( w_TEST->TYPE_M ) , "M" )
@@ -156,7 +156,7 @@ PROCEDURE Main_HVM()
TEST_LINE( Type( 100 ) , "E 1 BASE 1121 Argument error (TYPE) OS:0 #:0 A:1:N:100 F:S" )
TEST_LINE( Type( {} ) , "E 1 BASE 1121 Argument error (TYPE) OS:0 #:0 A:1:A:{.[0].} F:S" )
#endif
IF lDBFAvail
IF TEST_DBFAvail()
TEST_LINE( Type( "w_TEST->TYPE_C" ) , "C" )
TEST_LINE( Type( "w_TEST->TYPE_D" ) , "D" )
TEST_LINE( Type( "w_TEST->TYPE_M" ) , "M" )

4
harbour/utils/hbtest/rt_hvma.prg
View File

@@ -451,7 +451,7 @@ PROCEDURE Main_HVMA()
TEST_LINE( Len( "" ) , 0 )
TEST_LINE( Len( "123" ) , 3 )
TEST_LINE( Len( "123"+Chr(0)+"456 " ) , 8 )
IF lDBFAvail
IF TEST_DBFAvail()
TEST_LINE( Len( w_TEST->TYPE_C ) , 15 )
TEST_LINE( Len( w_TEST->TYPE_C_E ) , 15 )
TEST_LINE( Len( w_TEST->TYPE_M ) , 11 )
@@ -483,7 +483,7 @@ PROCEDURE Main_HVMA()
TEST_LINE( Empty( " x " ) , .F. )
TEST_LINE( Empty( " x"+Chr(0) ) , .F. )
TEST_LINE( Empty( " "+Chr(13)+"x"+Chr(9) ) , .F. )
IF lDBFAvail
IF TEST_DBFAvail()
TEST_LINE( Empty( w_TEST->TYPE_C ) , .F. )
TEST_LINE( Empty( w_TEST->TYPE_C_E ) , .T. )
TEST_LINE( Empty( w_TEST->TYPE_D ) , .F. )

2
harbour/utils/hbtest/rt_stra.prg
View File

@@ -64,7 +64,7 @@ PROCEDURE Main_STRA()
TEST_LINE( Str(100, 10, "A") , "E 1 BASE 1099 Argument error (STR) OS:0 #:0 A:3:N:100;N:10;C:A F:S" )
TEST_LINE( Str(100, 10, NIL) , "E 1 BASE 1099 Argument error (STR) OS:0 #:0 A:3:N:100;N:10;U:NIL F:S" )
TEST_LINE( Str(100, NIL, NIL) , "E 1 BASE 1099 Argument error (STR) OS:0 #:0 A:3:N:100;U:NIL;U:NIL F:S" )
IF lDBFAvail
IF TEST_DBFAvail()
TEST_LINE( Str( w_TEST->TYPE_N_I ) , " 100" )
TEST_LINE( Str( w_TEST->TYPE_N_IE ) , " 0" )
TEST_LINE( Str( w_TEST->TYPE_N_D ) , " 101.127" )

2
harbour/utils/hbtest/rt_vars.ch
View File

@@ -50,8 +50,6 @@
*
*/
MEMVAR lDBFAvail
MEMVAR mxNotHere /* Please don't declare this variable, since it's used to test undeclared MEMVAR situations. */
MEMVAR mcLongerNameThen10Chars
MEMVAR mcString