From a62097883b174f3db9cb13917f94aa4d82f8965e Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 11 Aug 2009 15:42:56 +0000 Subject: [PATCH] 2009-08-11 17:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + tests/hbpptest/hbpptest.hbp + tests/bldtest/bldtest.hbp + tests/multifnc/multifnc.hbp + Added hbmk2 make files (quite simple ones) for these tests. Better make them independent of the core make system. This way they also work outside the source distribution, f.e. when shipped inside a binary distro. - tests/hbpptest/Makefile - tests/bldtest/Makefile - tests/multifnc/Makefile - Deleted GNU Make files. - tests/Makefile - Deleted GNU Make file. hbmk2 is recommended to build these tests. The only missing feature compared to Makefile is auto-exclusion of "NOTEST" sources, anyway it's pretty apparent from first line of each source file, so it shouldn't be a problem. --- harbour/ChangeLog | 20 +++ harbour/tests/Makefile | 204 ---------------------------- harbour/tests/bldtest/Makefile | 13 -- harbour/tests/bldtest/bldtest.hbp | 5 + harbour/tests/hbpptest/Makefile | 18 --- harbour/tests/hbpptest/hbpptest.hbp | 7 + harbour/tests/multifnc/Makefile | 30 ---- harbour/tests/multifnc/multifnc.hbp | 12 ++ 8 files changed, 44 insertions(+), 265 deletions(-) delete mode 100644 harbour/tests/Makefile delete mode 100644 harbour/tests/bldtest/Makefile create mode 100644 harbour/tests/bldtest/bldtest.hbp delete mode 100644 harbour/tests/hbpptest/Makefile create mode 100644 harbour/tests/hbpptest/hbpptest.hbp delete mode 100644 harbour/tests/multifnc/Makefile create mode 100644 harbour/tests/multifnc/multifnc.hbp diff --git a/harbour/ChangeLog b/harbour/ChangeLog index caef6d7dad..47a441a8ce 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,26 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-11 17:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + + tests/hbpptest/hbpptest.hbp + + tests/bldtest/bldtest.hbp + + tests/multifnc/multifnc.hbp + + Added hbmk2 make files (quite simple ones) for these tests. + Better make them independent of the core make system. + This way they also work outside the source distribution, + f.e. when shipped inside a binary distro. + + - tests/hbpptest/Makefile + - tests/bldtest/Makefile + - tests/multifnc/Makefile + - Deleted GNU Make files. + + - tests/Makefile + - Deleted GNU Make file. hbmk2 is recommended to build these tests. + The only missing feature compared to Makefile is auto-exclusion + of "NOTEST" sources, anyway it's pretty apparent from first line + of each source file, so it shouldn't be a problem. + 2009-08-11 17:19 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/xhb/trpccli.prg ! fixed typo in function name. diff --git a/harbour/tests/Makefile b/harbour/tests/Makefile deleted file mode 100644 index e874fccb18..0000000000 --- a/harbour/tests/Makefile +++ /dev/null @@ -1,204 +0,0 @@ -# -# $Id$ -# - -ifeq ($(HB_MAIN),) - HB_MAIN := std -endif - -ROOT := ../ - -LIBS = $(HB_LIBS_ST_RDD) - -ifeq ($(PM),) # PM not defined = build all files - -PRG_SOURCES := \ - ac_test.prg \ - adirtest.prg \ - ainstest.prg \ - and_or.prg \ - array16.prg \ - arrayidx.prg \ - arrays.prg \ - arreval.prg \ - arrindex.prg \ - atest.prg \ - begin.prg \ - box.prg \ - boxtest.prg \ - byref.prg \ - calling.prg \ - cdow.prg \ - clasname.prg \ - classch.prg \ - classes.prg \ - clsdata.prg \ - cmphello.prg \ - codebl.prg \ - codebloc.prg \ - comments.prg \ - curdirt.prg \ - cursrtst.prg \ - dates.prg \ - dates2.prg \ - dates3.prg \ - db_brows.prg \ - dbevalts.prg \ - delimtst.prg \ - devtest.prg \ - dirtest.prg \ - disptest.prg \ - docase.prg \ - dosshell.prg \ - dynsym.prg \ - exittest.prg \ - fib.prg \ - fornext.prg \ - fortest.prg \ - fsplit.prg \ - hello.prg \ - ifelse.prg \ - ifinline.prg \ - initexit.prg \ - inkeytst.prg \ - inline.prg \ - iotest.prg \ - iotest2.prg \ - langapi.prg \ - lnlenli2.prg \ - longdev.prg \ - longstr.prg \ - longstr2.prg \ - memfile.prg \ - memory.prg \ - memvar.prg \ - menutest.prg \ - mousetst.prg \ - multiarg.prg \ - nums.prg \ - objects.prg \ - omacro.prg \ - onidle.prg \ - os.prg \ - output.prg \ - overload.prg \ - parexpr.prg \ - parseini.prg \ - passref.prg \ - procline.prg \ - procname.prg \ - readhrb.prg \ - recursiv.prg \ - returns.prg \ - rto_get.prg \ - rto_tb.prg \ - round.prg \ - say.prg \ - scroll.prg \ - sdf_test.prg \ - seconds.prg \ - server.prg \ - setkeys.prg \ - set_num.prg \ - set_test.prg \ - sound.prg \ - statinit.prg \ - statfun.prg \ - statics.prg \ - strdelim.prg \ - symbolt.prg \ - t1.prg \ - test_all.prg \ - testbrdb.prg \ - testbrw.prg \ - testcdx.prg \ - testcgi.prg \ - testdbf.prg \ - testdecl.prg \ - testerro.prg \ - testfor.prg \ - testhtml.prg \ - testhrb.prg \ - testid.prg \ - testinc.prg \ - testmem.prg \ - testntx.prg \ - testpre.prg \ - testprof.prg \ - testrdd.prg \ - testread.prg \ - teststr.prg \ - testvars.prg \ - testwarn.prg \ - tstalias.prg \ - tstasort.prg \ - tstcolor.prg \ - tstdbi.prg \ - tstdspac.prg \ - varparam.prg \ - version.prg \ - vmasort.prg \ - while.prg \ - newrdd.prg \ - brwpos.prg \ - -PRG_HEADERS := \ - db_brows.ch \ - cgi.ch \ - keywords.ch \ - test.ch \ - -BAD_PRG_SOURCES := \ - alias.prg \ - clasinit.prg \ - dates4.prg \ - debugtst.prg \ - dupvars.prg \ - dynobj.prg \ - extend1.prg \ - exthrb.prg \ - funcarr.prg \ - inherit.prg \ - inifiles.prg \ - keywords.prg \ - linecont.prg \ - lnlenli1.prg \ - mathtest.prg \ - objarr.prg \ - objasign.prg \ - rtfclass.prg \ - statics1.prg \ - statics2.prg \ - stripem.prg \ - test.prg \ - test10.prg \ - testgt.prg \ - testpp.prg \ - testtok.prg \ - tstprag.prg \ - vec1.prg \ - -C_SOURCES := \ - -C_HEADERS := \ - -BAD_C_SOURCES := \ - extend2.c \ - -include $(TOP)$(ROOT)config/test.cf - -else # PM defined = build specified file - -ifneq ($(findstring .prg,$(PM)),) - PRG_MAIN := $(PM) -else - ifneq ($(findstring .PRG,$(PM)),) - PRG_MAIN := $(PM) - else - PRG_MAIN := $(PM).prg - endif -endif - -include $(TOP)$(ROOT)config/bin.cf - -endif diff --git a/harbour/tests/bldtest/Makefile b/harbour/tests/bldtest/Makefile deleted file mode 100644 index 421aefb9fa..0000000000 --- a/harbour/tests/bldtest/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# -# $Id$ -# - -ROOT := ../../ - -C_SOURCES := \ - -C_MAIN := bldtest.c - -LIBS := \ - -include $(TOP)$(ROOT)config/bin.cf diff --git a/harbour/tests/bldtest/bldtest.hbp b/harbour/tests/bldtest/bldtest.hbp new file mode 100644 index 0000000000..620c00e171 --- /dev/null +++ b/harbour/tests/bldtest/bldtest.hbp @@ -0,0 +1,5 @@ +# +# $Id$ +# + +bldtest.c diff --git a/harbour/tests/hbpptest/Makefile b/harbour/tests/hbpptest/Makefile deleted file mode 100644 index beb5fefc6f..0000000000 --- a/harbour/tests/hbpptest/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# -# $Id$ -# - -ifeq ($(HB_MAIN),) - HB_MAIN := std -endif - -ROOT := ../../ - -PRG_SOURCES := \ - hbpptest.prg \ - -PRG_MAIN := hbpptest.prg - -LIBS = $(HB_LIBS_ST_NORDD) - -include $(TOP)$(ROOT)config/bin.cf diff --git a/harbour/tests/hbpptest/hbpptest.hbp b/harbour/tests/hbpptest/hbpptest.hbp new file mode 100644 index 0000000000..5a22d7a859 --- /dev/null +++ b/harbour/tests/hbpptest/hbpptest.hbp @@ -0,0 +1,7 @@ +# +# $Id$ +# + +hbpptest.prg + +-nulrdd diff --git a/harbour/tests/multifnc/Makefile b/harbour/tests/multifnc/Makefile deleted file mode 100644 index e558e64088..0000000000 --- a/harbour/tests/multifnc/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# -# $Id$ -# - -ifeq ($(HB_MAIN),) - HB_MAIN := std -endif - -ROOT := ../../ - -include $(TOP)$(ROOT)config/global.cf - -ifneq ($(findstring $(HB_COMPILER),gcc djgpp mingw cygwin),) -HB_USER_LDFLAGS += -Wl,--allow-multiple-definition -else -ifneq ($(findstring $(HB_COMPILER),msvc pocc xcc),) -HB_USER_LDFLAGS += /FORCE:MULTIPLE -endif -endif - -PRG_SOURCES := \ - t0.prg \ - t1.prg \ - t2.prg \ - -PRG_MAIN := t0.prg - -LIBS = $(HB_LIBS_ST_NORDD) - -include $(TOP)$(ROOT)config/bin.cf diff --git a/harbour/tests/multifnc/multifnc.hbp b/harbour/tests/multifnc/multifnc.hbp new file mode 100644 index 0000000000..0b4de01bd5 --- /dev/null +++ b/harbour/tests/multifnc/multifnc.hbp @@ -0,0 +1,12 @@ +# +# $Id$ +# + +-ldflag={allgcc}-Wl,--allow-multiple-definition +-ldflag={allmsvc|allpocc|xcc}/force:multiple + +t0.prg +t1.prg +t2.prg + +-nulrdd