* moved testopt to test/opt/ dir

This commit is contained in:
peter 2001-05-19 11:41:53 +00:00
parent 41246cda88
commit 8fc4cd45c2
2 changed files with 12 additions and 14 deletions

View File

@ -766,6 +766,7 @@ ifneq ($(wildcard fpcmake.loc),)
include fpcmake.loc include fpcmake.loc
endif endif
TESTSUBDIRS=cg units/system units/dos units/crt TESTSUBDIRS=cg units/system units/dos units/crt
TESTDIRS:=test $(addprefix test/,$(TESTSUBDIRS))
ifeq ($(OS_TARGET),linux) ifeq ($(OS_TARGET),linux)
INUNIX=1 INUNIX=1
endif endif
@ -800,27 +801,24 @@ endif
ifdef INTERACTIVE ifdef INTERACTIVE
override DOTESTOPT+=-i override DOTESTOPT+=-i
endif endif
DIRS=webtbs webtbf tbs tbf test testopt DIRS=webtbs webtbf tbs tbf test
%.log : %.pp %.log : %.pp
$(DOTEST) $(DOTESTOPT) $< $(DOTEST) $(DOTESTOPT) $<
%.elg : %.pp %.elg : %.pp
$(DOTEST) $(DOTESTOPT) -e $< $(DOTEST) $(DOTESTOPT) -e $<
.PHONY: alltbs alltbf allwebtbs allwebtbf alltest alltestopt alltests .PHONY: alltbs alltbf allwebtbs allwebtbf alltest alltests
alltbs : testcheck $(patsubst %.pp,%.log,$(wildcard tbs/t*.pp)) alltbs : testcheck $(patsubst %.pp,%.log,$(wildcard tbs/t*.pp))
alltbf : testcheck $(patsubst %.pp,%.log,$(wildcard tbf/t*.pp)) alltbf : testcheck $(patsubst %.pp,%.log,$(wildcard tbf/t*.pp))
allwebtbs : testcheck $(patsubst %.pp,%.log,$(wildcard webtbs/t*.pp)) allwebtbs : testcheck $(patsubst %.pp,%.log,$(wildcard webtbs/t*.pp))
allwebtbf : testcheck $(patsubst %.pp,%.log,$(wildcard webtbf/t*.pp)) allwebtbf : testcheck $(patsubst %.pp,%.log,$(wildcard webtbf/t*.pp))
TESTDIRS:=test $(addprefix test/,$(TESTSUBDIRS))
alltest : testcheck $(patsubst %.pp,%.log,$(wildcard $(addsuffix /t*.pp,$(TESTDIRS)))) alltest : testcheck $(patsubst %.pp,%.log,$(wildcard $(addsuffix /t*.pp,$(TESTDIRS))))
alltestopt : testcheck $(patsubst %.pp,%.log,$(wildcard testopt/t*.pp))
alltests: alltest alltbs alltbf allwebtbs allwebtbf alltests: alltest alltbs alltbf allwebtbs allwebtbf
.PHONY: allexectbs allexectbf allexecwebtbs allexecwebtbf allexectest allexectestopt allexectests .PHONY: allexectbs allexectbf allexecwebtbs allexecwebtbf allexectest allexectests
allexectbs : testcheck $(patsubst %.pp,%.elg,$(wildcard tbs/t*.pp)) allexectbs : testcheck $(patsubst %.pp,%.elg,$(wildcard tbs/t*.pp))
allexectbf : testcheck $(patsubst %.pp,%.elg,$(wildcard tbf/t*.pp)) allexectbf : testcheck $(patsubst %.pp,%.elg,$(wildcard tbf/t*.pp))
allexecwebtbs : testcheck $(patsubst %.pp,%.elg,$(wildcard webtbs/t*.pp)) allexecwebtbs : testcheck $(patsubst %.pp,%.elg,$(wildcard webtbs/t*.pp))
allexecwebtbf : testcheck $(patsubst %.pp,%.elg,$(wildcard webtbf/t*.pp)) allexecwebtbf : testcheck $(patsubst %.pp,%.elg,$(wildcard webtbf/t*.pp))
allexectest : testcheck $(patsubst %.pp,%.elg,$(wildcard test/t*.pp)) allexectest : testcheck $(patsubst %.pp,%.elg,$(wildcard $(addsuffix /t*.pp,$(TESTDIRS))))
allexectestopt : testcheck $(patsubst %.pp,%.elg,$(wildcard testopt/t*.pp))
allexectests: allexectest allexectbs allexectbf allexecwebtbs allexecwebtbf allexectests: allexectest allexectbs allexectbf allexecwebtbs allexecwebtbf
.PHONY: clean distclean .PHONY: clean distclean
clean: clean:

View File

@ -14,6 +14,9 @@ rule=allexectests
# Subdirs available in the test subdir # Subdirs available in the test subdir
TESTSUBDIRS=cg units/system units/dos units/crt TESTSUBDIRS=cg units/system units/dos units/crt
# All full dirnames in the test/ dir including the subdir self
TESTDIRS:=test $(addprefix test/,$(TESTSUBDIRS))
# Unix like OS ? # Unix like OS ?
ifeq ($(OS_TARGET),linux) ifeq ($(OS_TARGET),linux)
INUNIX=1 INUNIX=1
@ -74,7 +77,7 @@ endif
# Test run targets # Test run targets
# #
DIRS=webtbs webtbf tbs tbf test testopt DIRS=webtbs webtbf tbs tbf test
%.log : %.pp %.log : %.pp
$(DOTEST) $(DOTESTOPT) $< $(DOTEST) $(DOTESTOPT) $<
@ -86,7 +89,7 @@ DIRS=webtbs webtbf tbs tbf test testopt
# Compile tests # Compile tests
# #
.PHONY: alltbs alltbf allwebtbs allwebtbf alltest alltestopt alltests .PHONY: alltbs alltbf allwebtbs allwebtbf alltest alltests
alltbs : testcheck $(patsubst %.pp,%.log,$(wildcard tbs/t*.pp)) alltbs : testcheck $(patsubst %.pp,%.log,$(wildcard tbs/t*.pp))
alltbf : testcheck $(patsubst %.pp,%.log,$(wildcard tbf/t*.pp)) alltbf : testcheck $(patsubst %.pp,%.log,$(wildcard tbf/t*.pp))
@ -94,9 +97,7 @@ alltbf : testcheck $(patsubst %.pp,%.log,$(wildcard tbf/t*.pp))
allwebtbs : testcheck $(patsubst %.pp,%.log,$(wildcard webtbs/t*.pp)) allwebtbs : testcheck $(patsubst %.pp,%.log,$(wildcard webtbs/t*.pp))
allwebtbf : testcheck $(patsubst %.pp,%.log,$(wildcard webtbf/t*.pp)) allwebtbf : testcheck $(patsubst %.pp,%.log,$(wildcard webtbf/t*.pp))
TESTDIRS:=test $(addprefix test/,$(TESTSUBDIRS))
alltest : testcheck $(patsubst %.pp,%.log,$(wildcard $(addsuffix /t*.pp,$(TESTDIRS)))) alltest : testcheck $(patsubst %.pp,%.log,$(wildcard $(addsuffix /t*.pp,$(TESTDIRS))))
alltestopt : testcheck $(patsubst %.pp,%.log,$(wildcard testopt/t*.pp))
alltests: alltest alltbs alltbf allwebtbs allwebtbf alltests: alltest alltbs alltbf allwebtbs allwebtbf
@ -104,7 +105,7 @@ alltests: alltest alltbs alltbf allwebtbs allwebtbf
# Compile and Run tests # Compile and Run tests
# #
.PHONY: allexectbs allexectbf allexecwebtbs allexecwebtbf allexectest allexectestopt allexectests .PHONY: allexectbs allexectbf allexecwebtbs allexecwebtbf allexectest allexectests
allexectbs : testcheck $(patsubst %.pp,%.elg,$(wildcard tbs/t*.pp)) allexectbs : testcheck $(patsubst %.pp,%.elg,$(wildcard tbs/t*.pp))
allexectbf : testcheck $(patsubst %.pp,%.elg,$(wildcard tbf/t*.pp)) allexectbf : testcheck $(patsubst %.pp,%.elg,$(wildcard tbf/t*.pp))
@ -112,8 +113,7 @@ allexectbf : testcheck $(patsubst %.pp,%.elg,$(wildcard tbf/t*.pp))
allexecwebtbs : testcheck $(patsubst %.pp,%.elg,$(wildcard webtbs/t*.pp)) allexecwebtbs : testcheck $(patsubst %.pp,%.elg,$(wildcard webtbs/t*.pp))
allexecwebtbf : testcheck $(patsubst %.pp,%.elg,$(wildcard webtbf/t*.pp)) allexecwebtbf : testcheck $(patsubst %.pp,%.elg,$(wildcard webtbf/t*.pp))
allexectest : testcheck $(patsubst %.pp,%.elg,$(wildcard test/t*.pp)) allexectest : testcheck $(patsubst %.pp,%.elg,$(wildcard $(addsuffix /t*.pp,$(TESTDIRS))))
allexectestopt : testcheck $(patsubst %.pp,%.elg,$(wildcard testopt/t*.pp))
allexectests: allexectest allexectbs allexectbf allexecwebtbs allexecwebtbf allexectests: allexectest allexectbs allexectbf allexecwebtbs allexecwebtbf