Remove deprecated compiler/test/Makefile

This commit is contained in:
Martin Kinkelin 2023-12-02 22:53:14 +01:00
parent c847abc42a
commit 812d0611f2
2 changed files with 6 additions and 220 deletions

View file

@ -1,216 +0,0 @@
$(warning ===== DEPRECATION: test/Makefile is deprecated. Please use test/run.d instead.)
ifeq (Windows_NT,$(OS))
ifeq ($(findstring WOW64, $(shell uname)),WOW64)
OS:=windows
MODEL:=64
else
OS:=windows
MODEL:=32
endif
endif
ifeq (Win_32,$(OS))
OS:=windows
MODEL:=32
endif
ifeq (Win_32_64,$(OS))
OS:=windows
MODEL:=64
endif
ifeq (Win_64,$(OS))
OS:=windows
MODEL:=64
endif
include ../src/osmodel.mak
export OS
BUILD=release
ifeq (freebsd,$(OS))
SHELL=/usr/local/bin/bash
else ifeq (openbsd,$(OS))
SHELL=/usr/local/bin/bash
else ifeq (netbsd,$(OS))
SHELL=/usr/pkg/bin/bash
else ifeq (dragonflybsd,$(OS))
SHELL=/usr/local/bin/bash
else
SHELL=/bin/bash
endif
QUIET=@
export RESULTS_DIR=test_results
export MODEL
ifeq ($(findstring win,$(OS)),win)
export EXE=.exe
PIC?=0
DRUNTIME_PATH=..\..\druntime
PHOBOS_PATH=..\..\..\phobos
export DFLAGS=-I$(DRUNTIME_PATH)\import -I$(PHOBOS_PATH)
export LIB=$(PHOBOS_PATH)
# auto-tester might run the testsuite with a different $(MODEL) than DMD
# has been compiled with. Hence we manually check which binary exists.
# For windows the $(OS) during build is: `windows`
ifeq (,$(wildcard ../../generated/windows/$(BUILD)/64/dmd$(EXE)))
DMD_MODEL=32
else
DMD_MODEL=64
endif
export DMD=../../generated/windows/$(BUILD)/$(DMD_MODEL)/dmd$(EXE)
else
export EXE=
# auto-tester might run the testsuite with a different $(MODEL) than DMD
# has been compiled with. Hence we manually check which binary exists.
ifeq (,$(wildcard ../../generated/$(OS)/$(BUILD)/64/dmd))
DMD_MODEL=32
else
DMD_MODEL=64
endif
export DMD=../../generated/$(OS)/$(BUILD)/$(DMD_MODEL)/dmd
# default to PIC, use PIC=1/0 to en-/disable PIC.
# Note that shared libraries and C files are always compiled with PIC.
ifeq ($(PIC),)
PIC:=1
endif
ifeq ($(PIC),1)
export PIC_FLAG:=-fPIC
else
export PIC_FLAG:=
endif
DRUNTIME_PATH=../../druntime
PHOBOS_PATH=../../../phobos
# link against shared libraries (defaults to true on supported platforms, can be overridden w/ make SHARED=0)
SHARED=$(if $(findstring $(OS),linux freebsd),1,)
DFLAGS=-I$(DRUNTIME_PATH)/import -I$(PHOBOS_PATH) -L-L$(PHOBOS_PATH)/generated/$(OS)/$(BUILD)/$(MODEL)
ifeq (1,$(SHARED))
DFLAGS+=-defaultlib=libphobos2.so -L-rpath=$(PHOBOS_PATH)/generated/$(OS)/$(BUILD)/$(MODEL)
endif
export DFLAGS
endif
# Try to find a suitable dmd if HOST_DMD is missing
ifeq ($(HOST_DMD),)
# Legacy support, some CI's use HOST_DC instead of HOST_DMD
ifneq ($(HOST_DC),)
$(warning Please use HOST_DMD instead of HOST_DC!)
HOST_DMD = $(HOST_DC)
else
HOST_DMD = dmd
endif
endif
VERSION = $(filter v2.%, $(shell $(HOST_DMD) --version 2>/dev/null))
ifeq ($(VERSION),)
# dmd was not found in $PATH
USE_GENERATED=1
endif
ifneq ($(USE_GENERATED),)
# Use the generated dmd instead of the host compiler
HOST_DMD=$(DMD)
RUN_HOST_DMD=$(HOST_DMD) -conf=
else
RUN_HOST_DMD = $(HOST_DMD)
endif
# Ensure valid paths on windows
export HOST_DMD:=$(subst \,/,$(HOST_DMD))
RUNNER:=$(RESULTS_DIR)/run$(EXE)
EXECUTE_RUNNER:=$(RUNNER) --environment
# N determines the amount of parallel jobs, see ci/run.sh
ifneq ($(N),)
EXECUTE_RUNNER:=$(EXECUTE_RUNNER) --jobs=$N
endif
# Workaround https://issues.dlang.org/show_bug.cgi?id=23517
ifeq (osx,$(OS))
export MACOSX_DEPLOYMENT_TARGET=11
endif
ifeq (windows,$(OS))
all:
echo "Windows builds have been disabled"
else
all: run_tests
endif
quick: $(RUNNER)
$(EXECUTE_RUNNER) $@
clean:
@echo "Removing output directory: $(RESULTS_DIR)"
$(QUIET)if [ -e $(RESULTS_DIR) ]; then rm -rf $(RESULTS_DIR); fi
@echo "Remove coverage listing files: *.lst"
$(QUIET)rm -rf *.lst
@echo "Remove trace files: trace.def, trace.log"
$(QUIET)rm -rf trace.log trace.def
$(RESULTS_DIR)/.created:
@echo Creating output directory: $(RESULTS_DIR)
$(QUIET)if [ ! -d $(RESULTS_DIR) ]; then mkdir $(RESULTS_DIR); fi
$(QUIET)touch $(RESULTS_DIR)/.created
run_tests: run_all_tests
unit_tests: $(RUNNER)
@echo "Running unit tests"
$(EXECUTE_RUNNER) $@
run_runnable_tests: $(RUNNER)
$(EXECUTE_RUNNER) $@
start_runnable_tests: $(RUNNER)
@echo "Running runnable tests"
$(EXECUTE_RUNNER) run_runnable_tests
run_runnable_cxx_tests: $(RUNNER)
$(EXECUTE_RUNNER) $@
start_runnable_cxx_tests:
@echo "Running runnable_cxx tests"
$(QUIET)$(MAKE) $(DMD_TESTSUITE_MAKE_ARGS) --no-print-directory run_runnable_cxx_tests
run_compilable_tests: $(RUNNER)
$(EXECUTE_RUNNER) $@
start_compilable_tests: $(RUNNER)
@echo "Running compilable tests"
$(EXECUTE_RUNNER) run_compilable_tests
run_fail_compilation_tests: $(RUNNER)
$(EXECUTE_RUNNER) $@
start_fail_compilation_tests: $(RUNNER)
@echo "Running fail compilation tests"
$(EXECUTE_RUNNER) run_fail_compilation_tests
run_dshell_tests: $(RUNNER)
$(EXECUTE_RUNNER) $@
start_dshell_tests: $(RUNNER)
@echo "Running dshell tests"
$(EXECUTE_RUNNER) run_dshell_tests
run_all_tests: $(RUNNER)
$(EXECUTE_RUNNER)
start_all_tests: $(RUNNER)
@echo "Running all tests"
$(EXECUTE_RUNNER) all
$(RUNNER): run.d
$(RUN_HOST_DMD) $(MODEL_FLAG) $(PIC_FLAG) -g -od$(RESULTS_DIR) -of$(RUNNER) -i -release $<
# run.d is not reentrant because each invocation might attempt to build the required tools
.NOTPARALLEL:

View file

@ -14,6 +14,9 @@ all: $(GENERATED)/build
$(GENERATED)/build: compiler/src/build.d
$(HOST_DMD) -of$@ -g $<
$(GENERATED)/run: compiler/test/run.d
$(HOST_DMD) -of$@ -g -i -Icompiler/test -release $<
auto-tester-build:
echo "Auto-Tester has been disabled"
@ -27,13 +30,12 @@ toolchain-info: $(GENERATED)/build
clean:
rm -Rf $(GENERATED)
$(QUIET)$(MAKE) -C compiler/test -f Makefile clean
cd compiler/test && rm -rf test_results *.lst trace.log trace.def
$(RM) tags
test: $(GENERATED)/build
test: all $(GENERATED)/build $(GENERATED)/run
$(GENERATED)/build unittest
$(GENERATED)/build dmd
$(QUIET)$(MAKE) -C compiler/test -f Makefile
$(GENERATED)/run --environment HOST_DMD=$(HOST_DMD)
html: $(GENERATED)/build
$(GENERATED)/build $@