From df6b8e5340d117271b8b09bd5bd42bca04e1a175 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Thu, 13 Sep 2007 18:40:25 +0000 Subject: [PATCH] 2007-09-13 20:40 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/utils/hbtest/rt_misc.prg * harbour/utils/hbtest/make_c5x.bat + added alternative results for oGet:colorspec compatible with CL53 when HB_COMPAT_C53 macro is set --- harbour/ChangeLog | 6 +++ harbour/utils/hbtest/make_c5x.bat | 6 ++- harbour/utils/hbtest/rt_misc.prg | 81 ++++++++++++++++++++++++++++++- 3 files changed, 90 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4e2a9ff665..8f927bca91 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-09-13 20:40 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/utils/hbtest/rt_misc.prg + * harbour/utils/hbtest/make_c5x.bat + + added alternative results for oGet:colorspec compatible with CL53 + when HB_COMPAT_C53 macro is set + 2007-09-13 20:15 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/tests/run_prg.bat * harbour/tests/gnu_test.bat diff --git a/harbour/utils/hbtest/make_c5x.bat b/harbour/utils/hbtest/make_c5x.bat index 46dcaa3031..3cf6aa4711 100644 --- a/harbour/utils/hbtest/make_c5x.bat +++ b/harbour/utils/hbtest/make_c5x.bat @@ -1,4 +1,4 @@ -@echo off +rem @echo off rem rem $Id$ rem @@ -11,6 +11,8 @@ set lib=..\..\contrib\hbclip\;%lib% :NO_HBCLIP +rem set hb_clipopt=%hb_clipopt% /DHB_COMPAT_C53 + clipper hbtest.prg /w /n %hb_clipopt% clipper rt_array.prg /w /n %hb_clipopt% clipper rt_date.prg /w /n %hb_clipopt% @@ -23,7 +25,7 @@ clipper rt_str.prg /w /n %hb_clipopt% clipper rt_stra.prg /w /n %hb_clipopt% clipper rt_trans.prg /w /n %hb_clipopt% -if "%1" == "" set hb_linker=rtlink +if "%1" == "" set hb_linker=rtlink if not "%1" == "" set hb_linker=exospace %hb_linker% out hbtest5x fi hbtest,rt_array,rt_date,rt_file,rt_hvm,rt_hvma,rt_math,rt_misc,rt_str,rt_stra,rt_trans %hb_linkopt% diff --git a/harbour/utils/hbtest/rt_misc.prg b/harbour/utils/hbtest/rt_misc.prg index 08238d787f..79208133a2 100644 --- a/harbour/utils/hbtest/rt_misc.prg +++ b/harbour/utils/hbtest/rt_misc.prg @@ -168,6 +168,85 @@ FUNCTION Main_MISC() o := _GET_( tmp, "tmp" ) +#ifdef HB_COMPAT_C53 + TEST_LINE( ( o:colorSpec := "T" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "A" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "B" , o:colorSpec ) , "B/N,B/N,B/N,B/N" ) + TEST_LINE( ( o:colorSpec := "C" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "D" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "E" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "F" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "G" , o:colorSpec ) , "G/N,G/N,G/N,G/N" ) + TEST_LINE( ( o:colorSpec := "H" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "I" , o:colorSpec ) , "N/W,N/W,N/W,N/W" ) + TEST_LINE( ( o:colorSpec := "J" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "K" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "L" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "M" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "N" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "O" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "P" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "Q" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "R" , o:colorSpec ) , "R/N,R/N,R/N,R/N" ) + TEST_LINE( ( o:colorSpec := "S" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "T" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "U" , o:colorSpec ) , "U/N,U/N,U/N,U/N" ) + TEST_LINE( ( o:colorSpec := "V" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "W" , o:colorSpec ) , "W/N,W/N,W/N,W/N" ) + TEST_LINE( ( o:colorSpec := "X" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "Y" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "Z" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "0" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "1" , o:colorSpec ) , "B/N,B/N,B/N,B/N" ) + TEST_LINE( ( o:colorSpec := "2" , o:colorSpec ) , "G/N,G/N,G/N,G/N" ) + TEST_LINE( ( o:colorSpec := "3" , o:colorSpec ) , "BG/N,BG/N,BG/N,BG/N" ) + TEST_LINE( ( o:colorSpec := "4" , o:colorSpec ) , "R/N,R/N,R/N,R/N" ) + TEST_LINE( ( o:colorSpec := "5" , o:colorSpec ) , "BR/N,BR/N,BR/N,BR/N" ) + TEST_LINE( ( o:colorSpec := "6" , o:colorSpec ) , "GR/N,GR/N,GR/N,GR/N" ) + TEST_LINE( ( o:colorSpec := "7" , o:colorSpec ) , "W/N,W/N,W/N,W/N" ) + TEST_LINE( ( o:colorSpec := "8" , o:colorSpec ) , "N+/N,N+/N,N+/N,N+/N" ) + TEST_LINE( ( o:colorSpec := "9" , o:colorSpec ) , "B+/N,B+/N,B+/N,B+/N" ) + TEST_LINE( ( o:colorSpec := "10" , o:colorSpec ) , "G+/N,G+/N,G+/N,G+/N" ) + TEST_LINE( ( o:colorSpec := "11" , o:colorSpec ) , "BG+/N,BG+/N,BG+/N,BG+/N") + TEST_LINE( ( o:colorSpec := "12" , o:colorSpec ) , "R+/N,R+/N,R+/N,R+/N" ) + TEST_LINE( ( o:colorSpec := "13" , o:colorSpec ) , "BR+/N,BR+/N,BR+/N,BR+/N") + TEST_LINE( ( o:colorSpec := "14" , o:colorSpec ) , "GR+/N,GR+/N,GR+/N,GR+/N") + TEST_LINE( ( o:colorSpec := "15" , o:colorSpec ) , "W+/N,W+/N,W+/N,W+/N" ) + TEST_LINE( ( o:colorSpec := "16" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "@" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "!" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "-" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "/" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "//" , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "," , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := ",," , o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "+" , o:colorSpec ) , "N+/N,N+/N,N+/N,N+/N" ) +#ifdef HB_C52_STRICT_OFF + TEST_LINE( ( o:colorSpec := "+*" , o:colorSpec ) , "N+/N*,N+/N*,N+/N*,N+/N*") + TEST_LINE( ( o:colorSpec := "*" , o:colorSpec ) , "N/N*,N/N*,N/N*,N/N*" ) + TEST_LINE( ( o:colorSpec := "*+" , o:colorSpec ) , "N+/N*,N+/N*,N+/N*,N+/N*") +#else + TEST_LINE( ( o:colorSpec := "+*" , o:colorSpec ) , "N*+/N,N*+/N,N*+/N,N*+/N") + TEST_LINE( ( o:colorSpec := "*" , o:colorSpec ) , "N*/N,N*/N,N*/N,N*/N" ) + TEST_LINE( ( o:colorSpec := "*+" , o:colorSpec ) , "N*+/N,N*+/N,N*+/N,N*+/N") +#endif + TEST_LINE( ( o:colorSpec := "BR/W+" , o:colorSpec ) , "BR+/W,BR+/W,BR+/W,BR+/W") + TEST_LINE( ( o:colorSpec := "BR/W+" , o:colorSpec ) , "BR+/W,BR+/W,BR+/W,BR+/W") + TEST_LINE( ( o:colorSpec := "RB/W+" , o:colorSpec ) , "BR+/W,BR+/W,BR+/W,BR+/W") + TEST_LINE( ( o:colorSpec := "0123456789" , o:colorSpec ) , "BR/N,BR/N,BR/N,BR/N" ) + TEST_LINE( ( o:colorSpec := "1234567890" , o:colorSpec ) , "G/N,G/N,G/N,G/N" ) + TEST_LINE( ( o:colorSpec := "1" , o:colorSpec ) , "B/N,B/N,B/N,B/N" ) + TEST_LINE( ( o:colorSpec := "11" , o:colorSpec ) , "BG+/N,BG+/N,BG+/N,BG+/N") + TEST_LINE( ( o:colorSpec := "1111111111" , o:colorSpec ) , "W/N,W/N,W/N,W/N" ) + TEST_LINE( ( o:colorSpec := "2" , o:colorSpec ) , "G/N,G/N,G/N,G/N" ) + TEST_LINE( ( o:colorSpec := "22" , o:colorSpec ) , "GR/N,GR/N,GR/N,GR/N" ) + TEST_LINE( ( o:colorSpec := "2222222222" , o:colorSpec ) , "GR+/N,GR+/N,GR+/N,GR+/N") + TEST_LINE( ( o:colorSpec := "ABCDEFGHIJKLMNOPQRSTUVWXYZ", o:colorSpec ) , "N/N,N/N,N/N,N/N" ) + TEST_LINE( ( o:colorSpec := "ABCDEFGHIJKLMNOPQRSTUVW" , o:colorSpec ) , "N/U,N/U,N/U,N/U" ) + TEST_LINE( ( o:colorSpec := "N/W+" , o:colorSpec ) , "N+/W,N+/W,N+/W,N+/W" ) + TEST_LINE( ( o:colorSpec := '"W"'+"/"+'"R"' , o:colorSpec ) , "W/R,W/R,W/R,W/R" ) + TEST_LINE( ( o:colorSpec := "'W'"+"/"+"'R'" , o:colorSpec ) , "W/R,W/R,W/R,W/R" ) +#else TEST_LINE( ( o:colorSpec := "T" , o:colorSpec ) , "N/N,N/N" ) TEST_LINE( ( o:colorSpec := "A" , o:colorSpec ) , "N/N,N/N" ) TEST_LINE( ( o:colorSpec := "B" , o:colorSpec ) , "B/N,B/N" ) @@ -245,7 +324,7 @@ FUNCTION Main_MISC() TEST_LINE( ( o:colorSpec := "N/W+" , o:colorSpec ) , "N+/W,N+/W" ) TEST_LINE( ( o:colorSpec := '"W"'+"/"+'"R"' , o:colorSpec ) , "W/R,W/R" ) TEST_LINE( ( o:colorSpec := "'W'"+"/"+"'R'" , o:colorSpec ) , "W/R,W/R" ) - +#endif /* "Samples" function tests (AMPM(), DAYS(), ELAPTIME(), ... ) */ TEST_LINE( AMPM( "" ) , "12 am" )