paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-16 10:19:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

* make distclean fixed

Browse Source
This commit is contained in:
peter 2004-11-02 20:42:38 +00:00
parent 564c758c33
commit 12c523c694
3 changed files with 8 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/Makefile
View File

@ -1464,8 +1464,9 @@ zipinstall:
zipsourceinstall:
zipexampleinstall:
zipdistinstall:
cleanall:
makefiles: fpc_makefiles
.PHONY: debug smart release examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall makefiles
.PHONY: debug smart release examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall makefiles
ifneq ($(wildcard fpcmake.loc),)
include fpcmake.loc
endif
@ -1543,14 +1544,6 @@ endif
ifndef DOTEST
DOTEST=utils/dotest
endif
ifneq ($(wildcard utils/testfail$(SRCEXEEXT)),)
TESTCOMSPECRES:=$(shell utils/testfail$(SRCEXEEXT))
else
$(warning "*** WARNING testfail did not run ***")
endif
ifneq ($(TESTCOMSPECRES),)
NOCOMSPEC=1
endif
units:
$(MAKE) -C units FPC=$(TEST_FPC) CPU_TARGET=$(TEST_CPU_TARGET) OS_TARGET=$(TEST_OS_TARGET) \
OPT="$(TEST_OPT)" CCOMPILER=$(TEST_CCOMPILER) BINUTILSPREFIX=$(TEST_BINUTILSPREFIX)
@ -1607,9 +1600,6 @@ endif
ifdef DOALL
override DOTESTOPT+=-a
endif
ifdef NOCOMSPEC
override DOTESTOPT+=-x
endif
DIRS=webtbs webtbf tbs tbf $(TESTDIRS)
%.log : %.pp
$(DOTEST) $(DOTESTOPT) $<
@ -1654,10 +1644,8 @@ endif
clean:
$(MAKE) clean_test CPU_TARGET=$(TEST_CPU_TARGET) OS_TARGET=$(TEST_OS_TARGET)
$(MAKE) -C units clean CPU_TARGET=$(TEST_CPU_TARGET) OS_TARGET=$(TEST_OS_TARGET)
distclean: clean
$(MAKE) -C utils clean
cleanall: clean
$(MAKE) -C utils cleanall
distclean: clean fpc_distclean
$(MAKE) -C utils distclean
.PHONY: all full rundigest dailytest onlyknown onlygraph onlyinteractive
rundigest : utils
-$(DIGEST)
@ -1688,9 +1676,6 @@ info :
@$(ECHO) Driver environment:
@$(ECHO) " $(OS_TARGET)-$(CPU_TARGET)"
@$(ECHO) " compiler: $(FPC) ver: $(FPC_VERSION)"
ifdef COMSPEC
@$(ECHO) " and using COMSPEC=$(COMSPEC)"
endif
@$(ECHO)
@$(ECHO) Test environment:
@$(ECHO) " $(TEST_OS_TARGET)-$(TEST_CPU_TARGET)"

25
tests/Makefile.fpc
View File

@ -123,16 +123,6 @@ ifndef DOTEST
DOTEST=utils/dotest
endif
ifneq ($(wildcard utils/testfail$(SRCEXEEXT)),)
#BUG: This will not run first time for a fresh tests dir:
TESTCOMSPECRES:=$(shell utils/testfail$(SRCEXEEXT))
else
$(warning "*** WARNING testfail did not run ***")
endif
ifneq ($(TESTCOMSPECRES),)
NOCOMSPEC=1
endif
################################
# Units
@ -220,10 +210,6 @@ ifdef DOALL
override DOTESTOPT+=-a
endif
ifdef NOCOMSPEC
override DOTESTOPT+=-x
endif
################################
# Run tests
@ -304,11 +290,11 @@ clean:
$(MAKE) clean_test CPU_TARGET=$(TEST_CPU_TARGET) OS_TARGET=$(TEST_OS_TARGET)
$(MAKE) -C units clean CPU_TARGET=$(TEST_CPU_TARGET) OS_TARGET=$(TEST_OS_TARGET)
distclean: clean
$(MAKE) -C utils clean
distclean: clean fpc_distclean
$(MAKE) -C utils distclean
cleanall: clean
$(MAKE) -C utils cleanall
#cleanall: clean
# $(MAKE) -C utils cleanall
################################
# Main rules
@ -351,9 +337,6 @@ info :
@$(ECHO) Driver environment:
@$(ECHO) " $(OS_TARGET)-$(CPU_TARGET)"
@$(ECHO) " compiler: $(FPC) ver: $(FPC_VERSION)"
ifdef COMSPEC
@$(ECHO) " and using COMSPEC=$(COMSPEC)"
endif
@$(ECHO)
@$(ECHO) Test environment:
@$(ECHO) " $(TEST_OS_TARGET)-$(TEST_CPU_TARGET)"

3
tests/webtbs/tw2110.pp
View File

@ -1,6 +1,3 @@
{ %OPT=-Or }
{ %CPU=i386 }
{ m68k compiler does not recognize -Or option }
{ Source provided for Free Pascal Bug Report 2110 }
{ Submitted by "Alex" on 2002-09-05 }
{ e-mail: bjer@freemail.hu }