From fc2ddd50e3a61595cd2a63ff7ced307c987d8889 Mon Sep 17 00:00:00 2001 From: yury Date: Sun, 4 Feb 2007 18:36:01 +0000 Subject: [PATCH] * fixed dbdigest.cfg creation and prepup executing when shell is cmd.exe git-svn-id: trunk@6336 - --- tests/Makefile | 16 ++++++++-------- tests/Makefile.fpc | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index d9351e2d9e..4403147dae 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1509,13 +1509,13 @@ distclean: clean fpc_distclean digest : utils -$(DIGEST) $(LOG) $(TEST_OUTPUTDIR)/dbdigest.cfg: - $(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 + $(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 ifndef inWinNT $(TEST_OUTPUTDIR)/tar.lst: cd $(TEST_OUTPUTDIR) && find . -name '*.log' -o -name '*.elg' > tar.lst @@ -1528,7 +1528,7 @@ endif cd $(TEST_OUTPUTDIR) && tar cfz $(DB_TARGZ) --files-from=tar.lst else $(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/dbdigest.cfg - cd $(TEST_OUTPUTDIR) && $(subst /,\,../../$(PREPUP)) $(DB_TARGZ) + cd $(TEST_OUTPUTDIR) && "../../$(PREPUP)" $(DB_TARGZ) endif uploadrun: $(TEST_OUTPUTDIR)/$(DB_TARGZ) ifdef inWinNT diff --git a/tests/Makefile.fpc b/tests/Makefile.fpc index e286573079..d30917051c 100644 --- a/tests/Makefile.fpc +++ b/tests/Makefile.fpc @@ -316,13 +316,13 @@ digest : utils -$(DIGEST) $(LOG) $(TEST_OUTPUTDIR)/dbdigest.cfg: - $(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 + $(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 ifndef inWinNT $(TEST_OUTPUTDIR)/tar.lst: @@ -338,7 +338,7 @@ endif else $(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/dbdigest.cfg - cd $(TEST_OUTPUTDIR) && $(subst /,\,../../$(PREPUP)) $(DB_TARGZ) + cd $(TEST_OUTPUTDIR) && "../../$(PREPUP)" $(DB_TARGZ) endif uploadrun: $(TEST_OUTPUTDIR)/$(DB_TARGZ)