paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-15 17:49:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

* uploadrun target to upload data for testsuite db using scp

Browse Source
This commit is contained in:
peter 2005-05-15 12:07:42 +00:00
parent f40369dbd3
commit febe82acd2
2 changed files with 94 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
tests/Makefile
View File

@ -1285,6 +1285,10 @@ ifneq ($(wildcard fpcmake.loc),)
include fpcmake.loc include fpcmake.loc
endif endif
unexport FPC_VERSION unexport FPC_VERSION
TEST_HOSTNAME:=$(shell hostname -s)
ifeq ($(TEST_HOSTNAME),)
TEST_HOSTNAME:=$(shell hostname)
endif
ifndef TEST_FPC ifndef TEST_FPC
TEST_FPC=$(wildcard $(dir $(CURDIR))compiler/$(notdir $(FPC))) TEST_FPC=$(wildcard $(dir $(CURDIR))compiler/$(notdir $(FPC)))
ifeq ($(TEST_FPC), ) ifeq ($(TEST_FPC), )
@ -1329,6 +1333,13 @@ endif
endif endif
endif endif
TEST_OUTPUTDIR=output/$(TEST_FULL_TARGET) TEST_OUTPUTDIR=output/$(TEST_FULL_TARGET)
TEST_DATETIME:=$(shell $(DATE) +%Y%m%d%H%M)
ifndef TEST_USER
TEST_USER=$(USER)
endif
DB_TARGZ=$(TEST_HOSTNAME)-$(TEST_DATETIME).tar.gz
DB_HOST=fpc@www.freepascal.org
DB_UPLOADDIR=/home/fpc/testsuite/incoming
ifndef FAILLIST ifndef FAILLIST
export FAILLIST:=$(TEST_OUTPUTDIR)/faillist export FAILLIST:=$(TEST_OUTPUTDIR)/faillist
endif endif
@ -1351,9 +1362,6 @@ utils:
$(MAKE) -C utils utils $(MAKE) -C utils utils
utilsdb: utilsdb:
$(MAKE) -C utils utilsdb $(MAKE) -C utils utilsdb
ifndef DBDIGEST
DBDIGEST=utils/dbdigest
endif
ifndef DIGEST ifndef DIGEST
DIGEST=utils/digest DIGEST=utils/digest
endif endif
@ -1455,14 +1463,29 @@ distclean: clean fpc_distclean
$(DELTREE) output $(DELTREE) output
$(MAKE) -C utils distclean $(MAKE) -C utils distclean
-$(DEL) testprep-stamp.* -$(DEL) testprep-stamp.*
.PHONY: all full digest dailytest onlyknown onlygraph onlyinteractive .PHONY: all full digest onlyknown onlygraph onlyinteractive
digest : utils digest : utils
-$(DIGEST) $(LOG) -$(DIGEST) $(LOG)
dbdigest: utilsdb $(TEST_OUTPUTDIR)/dbdigest.cfg:
-$(DBDIGEST) -v $(TEST_FPC_VERSION) -o $(TEST_OS_TARGET) -c $(TEST_CPU_TARGET) -l $(LOG) $(DBDIGESTOPT) $(ECHOREDIR) "OS=$(TEST_OS_TARGET)" > $(TEST_OUTPUTDIR)/dbdigest.cfg
$(ECHOREDIR) "CPU=$(TEST_CPU_TARGET)" >> $(TEST_OUTPUTDIR)/dbdigest.cfg
$(ECHOREDIR) "Version=$(TEST_FPC_VERSION)" >> $(TEST_OUTPUTDIR)/dbdigest.cfg
$(ECHOREDIR) "LogFile=log" >> $(TEST_OUTPUTDIR)/dbdigest.cfg
$(ECHOREDIR) "Submitter=$(TEST_USER)" >> $(TEST_OUTPUTDIR)/dbdigest.cfg
$(ECHOREDIR) "Machine=$(TEST_HOSTNAME)" >> $(TEST_OUTPUTDIR)/dbdigest.cfg
$(ECHOREDIR) "Comment=$(TEST_OPT)" >> $(TEST_OUTPUTDIR)/dbdigest.cfg
$(TEST_OUTPUTDIR)/tar.lst:
cd $(TEST_OUTPUTDIR) && find . -name '*.log' -or -name '*.elg' > tar.lst
$(ECHOREDIR) "log" >> $(TEST_OUTPUTDIR)/tar.lst
$(ECHOREDIR) "dbdigest.cfg" >> $(TEST_OUTPUTDIR)/tar.lst
$(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/tar.lst $(TEST_OUTPUTDIR)/dbdigest.cfg
cd $(TEST_OUTPUTDIR) && tar cfz $(DB_TARGZ) --files-from=tar.lst
uploadrun: $(TEST_OUTPUTDIR)/$(DB_TARGZ)
scp $(TEST_OUTPUTDIR)/$(DB_TARGZ) $(DB_HOST):$(DB_UPLOADDIR)/$(DB_TARGZ).part
ssh $(DB_HOST) "mv $(DB_UPLOADDIR)/$(DB_TARGZ).part $(DB_UPLOADDIR)/$(DB_TARGZ)"
all : allexectests all : allexectests
full : clean allexectests digest full : clean allexectests digest
fulldb : clean allexectests digest dbdigest fulldb : clean allexectests digest uploadrun
onlyknown : onlyknown :
$(MAKE) full "DOTESTOPT= $(DOTESTOPT) -k-" $(MAKE) full "DOTESTOPT= $(DOTESTOPT) -k-"
onlygraph : onlygraph :
@ -1472,15 +1495,16 @@ onlyinteractive :
info : info :
@$(ECHO) "This Makefile allows to test the compiler" @$(ECHO) "This Makefile allows to test the compiler"
@$(ECHO) @$(ECHO)
@$(ECHO) "Targets:" @$(ECHO) "Basic Targets:"
@$(ECHO) " all - continue all tests" @$(ECHO) " all - continue all tests"
@$(ECHO) " full - clean and run all tests" @$(ECHO) " full - clean and run all tests"
@$(ECHO) " dailytest - run full and save results" @$(ECHO) " fulldb - full and upload test results"
@$(ECHO) " in files having the date as extension" @$(ECHO) " digest - compute and print test statistics"
@$(ECHO)
@$(ECHO) "Advanced Targets:"
@$(ECHO) " onlyknown - run only known bugs" @$(ECHO) " onlyknown - run only known bugs"
@$(ECHO) " onlygraph - run only graph tests" @$(ECHO) " onlygraph - run only graph tests"
@$(ECHO) " onlyinteractive - run only interactive tests" @$(ECHO) " onlyinteractive - run only interactive tests"
@$(ECHO) " digest - compute and print test statistics"
@$(ECHO) @$(ECHO)
@$(ECHO) "Host environment:" @$(ECHO) "Host environment:"
@$(ECHO) " $(FULL_TARGET)" @$(ECHO) " $(FULL_TARGET)"
@ -1489,10 +1513,9 @@ info :
@$(ECHO) "Test environment:" @$(ECHO) "Test environment:"
@$(ECHO) " $(TEST_FULL_TARGET)" @$(ECHO) " $(TEST_FULL_TARGET)"
@$(ECHO) " compiler: $(TEST_FPC) ver: $(TEST_FPC_VERSION)" @$(ECHO) " compiler: $(TEST_FPC) ver: $(TEST_FPC_VERSION)"
override DATESUFFIX:=$(shell $(DATE) +%Y.%m.%d) @$(ECHO)
ifneq ($(wildcard log.$(DATESUFFIX)),) @$(ECHO) "Output settings:"
override DATESUFFIX=$(shell $(DATE) +%Y.%m.%d.%H.%M) @$(ECHO) " DateTime : $(TEST_DATETIME)"
endif @$(ECHO) " Outputdir: $(TEST_OUTPUTDIR)"
ifneq ($(wildcard lastdate.txt),) @$(ECHO) " Uploaddir: $(DB_UPLOADDIR)"
LASTDATESUFFIX:=$(shell cat lastdate.txt) @$(ECHO) " tar.gz : $(DB_TARGZ)"
endif

75
tests/Makefile.fpc
View File

@ -16,6 +16,11 @@ unexport FPC_VERSION
# Test environment setup # Test environment setup
# #
TEST_HOSTNAME:=$(shell hostname -s)
ifeq ($(TEST_HOSTNAME),)
TEST_HOSTNAME:=$(shell hostname)
endif
ifndef TEST_FPC ifndef TEST_FPC
#Use development version of the compiler #Use development version of the compiler
TEST_FPC=$(wildcard $(dir $(CURDIR))compiler/$(notdir $(FPC))) TEST_FPC=$(wildcard $(dir $(CURDIR))compiler/$(notdir $(FPC)))
@ -69,6 +74,17 @@ endif
# Target dir where the ppu and binaries are created # Target dir where the ppu and binaries are created
TEST_OUTPUTDIR=output/$(TEST_FULL_TARGET) TEST_OUTPUTDIR=output/$(TEST_FULL_TARGET)
# Date and time the testsuite was run
TEST_DATETIME:=$(shell $(DATE) +%Y%m%d%H%M)
ifndef TEST_USER
TEST_USER=$(USER)
endif
# Testsuite upload
DB_TARGZ=$(TEST_HOSTNAME)-$(TEST_DATETIME).tar.gz
DB_HOST=fpc@www.freepascal.org
DB_UPLOADDIR=/home/fpc/testsuite/incoming
################################ ################################
# Misc # Misc
@ -115,10 +131,6 @@ utils:
utilsdb: utilsdb:
$(MAKE) -C utils utilsdb $(MAKE) -C utils utilsdb
ifndef DBDIGEST
DBDIGEST=utils/dbdigest
endif
ifndef DIGEST ifndef DIGEST
DIGEST=utils/digest DIGEST=utils/digest
endif endif
@ -297,19 +309,37 @@ distclean: clean fpc_distclean
# Main rules # Main rules
# #
.PHONY: all full digest dailytest onlyknown onlygraph onlyinteractive .PHONY: all full digest onlyknown onlygraph onlyinteractive
digest : utils digest : utils
-$(DIGEST) $(LOG) -$(DIGEST) $(LOG)
dbdigest: utilsdb $(TEST_OUTPUTDIR)/dbdigest.cfg:
-$(DBDIGEST) -v $(TEST_FPC_VERSION) -o $(TEST_OS_TARGET) -c $(TEST_CPU_TARGET) -l $(LOG) $(DBDIGESTOPT) $(ECHOREDIR) "OS=$(TEST_OS_TARGET)" > $(TEST_OUTPUTDIR)/dbdigest.cfg
$(ECHOREDIR) "CPU=$(TEST_CPU_TARGET)" >> $(TEST_OUTPUTDIR)/dbdigest.cfg
$(ECHOREDIR) "Version=$(TEST_FPC_VERSION)" >> $(TEST_OUTPUTDIR)/dbdigest.cfg
$(ECHOREDIR) "LogFile=log" >> $(TEST_OUTPUTDIR)/dbdigest.cfg
$(ECHOREDIR) "Submitter=$(TEST_USER)" >> $(TEST_OUTPUTDIR)/dbdigest.cfg
$(ECHOREDIR) "Machine=$(TEST_HOSTNAME)" >> $(TEST_OUTPUTDIR)/dbdigest.cfg
$(ECHOREDIR) "Comment=$(TEST_OPT)" >> $(TEST_OUTPUTDIR)/dbdigest.cfg
$(TEST_OUTPUTDIR)/tar.lst:
cd $(TEST_OUTPUTDIR) && find . -name '*.log' -or -name '*.elg' > tar.lst
$(ECHOREDIR) "log" >> $(TEST_OUTPUTDIR)/tar.lst
$(ECHOREDIR) "dbdigest.cfg" >> $(TEST_OUTPUTDIR)/tar.lst
$(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/tar.lst $(TEST_OUTPUTDIR)/dbdigest.cfg
cd $(TEST_OUTPUTDIR) && tar cfz $(DB_TARGZ) --files-from=tar.lst
uploadrun: $(TEST_OUTPUTDIR)/$(DB_TARGZ)
scp $(TEST_OUTPUTDIR)/$(DB_TARGZ) $(DB_HOST):$(DB_UPLOADDIR)/$(DB_TARGZ).part
ssh $(DB_HOST) "mv $(DB_UPLOADDIR)/$(DB_TARGZ).part $(DB_UPLOADDIR)/$(DB_TARGZ)"
all : allexectests all : allexectests
full : clean allexectests digest full : clean allexectests digest
fulldb : clean allexectests digest dbdigest fulldb : clean allexectests digest uploadrun
onlyknown : onlyknown :
$(MAKE) full "DOTESTOPT= $(DOTESTOPT) -k-" $(MAKE) full "DOTESTOPT= $(DOTESTOPT) -k-"
@ -323,15 +353,16 @@ onlyinteractive :
info : info :
@$(ECHO) "This Makefile allows to test the compiler" @$(ECHO) "This Makefile allows to test the compiler"
@$(ECHO) @$(ECHO)
@$(ECHO) "Targets:" @$(ECHO) "Basic Targets:"
@$(ECHO) " all - continue all tests" @$(ECHO) " all - continue all tests"
@$(ECHO) " full - clean and run all tests" @$(ECHO) " full - clean and run all tests"
@$(ECHO) " dailytest - run full and save results" @$(ECHO) " fulldb - full and upload test results"
@$(ECHO) " in files having the date as extension" @$(ECHO) " digest - compute and print test statistics"
@$(ECHO)
@$(ECHO) "Advanced Targets:"
@$(ECHO) " onlyknown - run only known bugs" @$(ECHO) " onlyknown - run only known bugs"
@$(ECHO) " onlygraph - run only graph tests" @$(ECHO) " onlygraph - run only graph tests"
@$(ECHO) " onlyinteractive - run only interactive tests" @$(ECHO) " onlyinteractive - run only interactive tests"
@$(ECHO) " digest - compute and print test statistics"
@$(ECHO) @$(ECHO)
@$(ECHO) "Host environment:" @$(ECHO) "Host environment:"
@$(ECHO) " $(FULL_TARGET)" @$(ECHO) " $(FULL_TARGET)"
@ -340,13 +371,9 @@ info :
@$(ECHO) "Test environment:" @$(ECHO) "Test environment:"
@$(ECHO) " $(TEST_FULL_TARGET)" @$(ECHO) " $(TEST_FULL_TARGET)"
@$(ECHO) " compiler: $(TEST_FPC) ver: $(TEST_FPC_VERSION)" @$(ECHO) " compiler: $(TEST_FPC) ver: $(TEST_FPC_VERSION)"
@$(ECHO)
override DATESUFFIX:=$(shell $(DATE) +%Y.%m.%d) @$(ECHO) "Output settings:"
@$(ECHO) " DateTime : $(TEST_DATETIME)"
ifneq ($(wildcard log.$(DATESUFFIX)),) @$(ECHO) " Outputdir: $(TEST_OUTPUTDIR)"
override DATESUFFIX=$(shell $(DATE) +%Y.%m.%d.%H.%M) @$(ECHO) " Uploaddir: $(DB_UPLOADDIR)"
endif @$(ECHO) " tar.gz : $(DB_TARGZ)"
ifneq ($(wildcard lastdate.txt),)
LASTDATESUFFIX:=$(shell cat lastdate.txt)
endif