From 7d9c125c58f39223d40a15f2f2787643f9aa4e0c Mon Sep 17 00:00:00 2001 From: plherrin <pherring04@gmail.com> Date: Wed, 2 Apr 2025 09:32:04 -0500 Subject: [PATCH] Updated tests to use trickify s overrides --- test/SIM_trickified_archive/S_overrides.mk | 2 ++ .../trickified/myproject_vars.mk | 13 ------------- test/SIM_trickified_object/S_overrides.mk | 2 ++ .../trickified/myproject_vars.mk | 13 ------------- test/SIM_trickified_shared/S_overrides.mk | 2 ++ .../trickified/myproject_vars.mk | 15 +-------------- 6 files changed, 7 insertions(+), 40 deletions(-) diff --git a/test/SIM_trickified_archive/S_overrides.mk b/test/SIM_trickified_archive/S_overrides.mk index e17d8690..4ed5fb86 100644 --- a/test/SIM_trickified_archive/S_overrides.mk +++ b/test/SIM_trickified_archive/S_overrides.mk @@ -1,4 +1,6 @@ LOCAL_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) +include trickified_project/trickified/S_overrides_trickify.mk + TRICK_CXXFLAGS += -I$(LOCAL_DIR)/models include $(CURDIR)/trickified_project/trickified/myproject.mk diff --git a/test/SIM_trickified_archive/trickified_project/trickified/myproject_vars.mk b/test/SIM_trickified_archive/trickified_project/trickified/myproject_vars.mk index 4454d8a7..0d07f2b3 100644 --- a/test/SIM_trickified_archive/trickified_project/trickified/myproject_vars.mk +++ b/test/SIM_trickified_archive/trickified_project/trickified/myproject_vars.mk @@ -13,16 +13,3 @@ TRICK_CXXFLAGS += $(MYPROJECT_INCLUDE) $(MYPROJECT_SOURCE) export TRICKIFY_OBJECT_NAME := trickified_myproject.a MYPROJECT_TRICK := $(MYPROJECT_HOME)/trickified/$(TRICKIFY_OBJECT_NAME) - -# Tell Trick the headers and source at this location are part of a -# Trickified project -TRICK_EXT_LIB_DIRS += :$(MYPROJECT_HOME) - -# Tell Trick where to find the Python modules generated by SWIG -TRICK_PYTHON_PATH += :$(MYPROJECT_HOME)/trickified/python - -# Tell SWIG where to find py_*.i files -TRICK_SWIG_FLAGS += -I$(MYPROJECT_HOME)/trickified - -# Link in the Trickified object -TRICK_LDFLAGS += $(MYPROJECT_TRICK) diff --git a/test/SIM_trickified_object/S_overrides.mk b/test/SIM_trickified_object/S_overrides.mk index e17d8690..4ed5fb86 100644 --- a/test/SIM_trickified_object/S_overrides.mk +++ b/test/SIM_trickified_object/S_overrides.mk @@ -1,4 +1,6 @@ LOCAL_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) +include trickified_project/trickified/S_overrides_trickify.mk + TRICK_CXXFLAGS += -I$(LOCAL_DIR)/models include $(CURDIR)/trickified_project/trickified/myproject.mk diff --git a/test/SIM_trickified_object/trickified_project/trickified/myproject_vars.mk b/test/SIM_trickified_object/trickified_project/trickified/myproject_vars.mk index 3f562422..bb75066d 100644 --- a/test/SIM_trickified_object/trickified_project/trickified/myproject_vars.mk +++ b/test/SIM_trickified_object/trickified_project/trickified/myproject_vars.mk @@ -13,16 +13,3 @@ TRICK_CXXFLAGS += $(MYPROJECT_INCLUDE) $(MYPROJECT_SOURCE) export TRICKIFY_OBJECT_NAME := trickified_myproject.o MYPROJECT_TRICK := $(MYPROJECT_HOME)/trickified/$(TRICKIFY_OBJECT_NAME) - -# Tell Trick the headers and source at this location are part of a -# Trickified project -TRICK_EXT_LIB_DIRS += :$(MYPROJECT_HOME) - -# Tell Trick where to find the Python modules generated by SWIG -TRICK_PYTHON_PATH += :$(MYPROJECT_HOME)/trickified/python - -# Tell SWIG where to find py_*.i files -TRICK_SWIG_FLAGS += -I$(MYPROJECT_HOME)/trickified - -# Link in the Trickified object -TRICK_LDFLAGS += $(MYPROJECT_TRICK) diff --git a/test/SIM_trickified_shared/S_overrides.mk b/test/SIM_trickified_shared/S_overrides.mk index e17d8690..4ed5fb86 100644 --- a/test/SIM_trickified_shared/S_overrides.mk +++ b/test/SIM_trickified_shared/S_overrides.mk @@ -1,4 +1,6 @@ LOCAL_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) +include trickified_project/trickified/S_overrides_trickify.mk + TRICK_CXXFLAGS += -I$(LOCAL_DIR)/models include $(CURDIR)/trickified_project/trickified/myproject.mk diff --git a/test/SIM_trickified_shared/trickified_project/trickified/myproject_vars.mk b/test/SIM_trickified_shared/trickified_project/trickified/myproject_vars.mk index dab1a92d..869bfdbb 100644 --- a/test/SIM_trickified_shared/trickified_project/trickified/myproject_vars.mk +++ b/test/SIM_trickified_shared/trickified_project/trickified/myproject_vars.mk @@ -21,18 +21,5 @@ export TRICKIFY_OBJECT_NAME := trickified_myproject.$(BUILD_TYPE) MYPROJECT_TRICK := $(MYPROJECT_HOME)/trickified/$(TRICKIFY_OBJECT_NAME) -# Tell Trick the headers and source at this location are part of a -# Trickified project -TRICK_EXT_LIB_DIRS += :$(MYPROJECT_HOME) - -# Tell Trick where to find the Python modules generated by SWIG -TRICK_PYTHON_PATH += :$(MYPROJECT_HOME)/trickified/python - -# Tell SWIG where to find py_*.i files -TRICK_SWIG_FLAGS += -I$(MYPROJECT_HOME)/trickified - -# Link in the Trickified object -TRICK_LDFLAGS += $(MYPROJECT_TRICK) - # Link in code coverage libraries for Trick code coverage CI -export USER_ADDITIONAL_OPTIONS := -fprofile-arcs -ftest-coverage -O0 \ No newline at end of file +export USER_ADDITIONAL_OPTIONS := -fprofile-arcs -ftest-coverage -O0