Skip to content

Commit

Permalink
Fixup: Re-enable the VHDL library tests
Browse files Browse the repository at this point in the history
  • Loading branch information
imphil committed Jun 28, 2023
1 parent 2f02888 commit c9d729c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions tests/test_cases/test_vhdl_libraries/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ ifneq ($(filter $(SIM),xcelium),)
COMPILE_ARGS += -v93
endif

ifneq ($(filter questa modelsim xcelium ius,$(shell echo $(SIM) | tr A-Z a-z)),)
ifneq ($(filter questa-compat questa-qisqrun modelsim xcelium ius,$(shell echo $(SIM) | tr A-Z a-z)),)
VHDL_LIB_ORDER := blib
endif

ifneq ($(shell echo $(TOPLEVEL_LANG) | tr A-Z a-z),vhdl)
all:
@echo "Skipping test since only VHDL is supported"
clean::
else ifeq ($(filter ghdl questa modelsim xcelium ius,$(shell echo $(SIM) | tr A-Z a-z)),)
else ifeq ($(filter ghdl questa-compat questa-qisqrun modelsim xcelium ius,$(shell echo $(SIM) | tr A-Z a-z)),)
all:
@echo "Skipping test since only GHDL, Questa/ModelSim, Xcelium and Incisive are supported"
clean::
Expand Down
4 changes: 2 additions & 2 deletions tests/test_cases/test_vhdl_libraries_multiple/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ ifneq ($(filter $(SIM),xcelium),)
COMPILE_ARGS += -v93
endif

ifneq ($(filter questa modelsim xcelium,$(shell echo $(SIM) | tr A-Z a-z)),)
ifneq ($(filter questa questa-compat questa-qisqrun modelsim xcelium,$(shell echo $(SIM) | tr A-Z a-z)),)
VHDL_LIB_ORDER := elib dlib clib blib
endif

ifneq ($(shell echo $(TOPLEVEL_LANG) | tr A-Z a-z),vhdl)
all:
@echo "Skipping test since only VHDL is supported"
clean::
else ifeq ($(filter ghdl questa modelsim xcelium,$(shell echo $(SIM) | tr A-Z a-z)),)
else ifeq ($(filter ghdl questa-compat questa-qisqrun modelsim xcelium,$(shell echo $(SIM) | tr A-Z a-z)),)
all:
@echo "Skipping test since only GHDL, Questa/ModelSim and Xcelium are supported"
clean::
Expand Down

0 comments on commit c9d729c

Please sign in to comment.