ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-19 21:27:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't run unit tests that require er7_utils. Fixes #2

Browse Source
This commit is contained in:
Alex Lin 2015-03-02 16:19:38 -06:00
parent a1a024f320
commit 35bc121403
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@ -106,10 +106,13 @@ SWIG_OBJS = $(addsuffix /object_$(TRICK_HOST_CPU)/*.o ,$(SWIG_DIRS))
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Specify where to find units tests. # Specify where to find units tests.
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
UNIT_TEST_DIRS = \ UNIT_TEST_DIRS := \
$(wildcard ${TRICK_HOME}/trick_source/sim_services/*/test) \ $(wildcard ${TRICK_HOME}/trick_source/sim_services/*/test) \
$(wildcard ${TRICK_HOME}/trick_source/trick_utils/*/test) \ $(wildcard ${TRICK_HOME}/trick_source/trick_utils/*/test) \
${TRICK_HOME}/trick_source/data_products/DPX/test/unit_test ${TRICK_HOME}/trick_source/data_products/DPX/test/unit_test
ifeq ($(USE_ER7_UTILS_INTEGRATORS), 0)
UNIT_TEST_DIRS := $(filter-out %Integrator/test,$(UNIT_TEST_DIRS))
endif
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# FIXME: # FIXME:
@ -259,7 +262,7 @@ premade:
# TESTING # TESTING
################################################################################ ################################################################################
# This target runs Trick's Unit-tests and simulation-tests. # This target runs Trick's Unit-tests and simulation-tests.
test: unit_test sim_test requirements test: unit_test sim_test
@ echo "All tests completed sucessfully" @ echo "All tests completed sucessfully"
.PHONY: $(UNIT_TEST_DIRS) .PHONY: $(UNIT_TEST_DIRS)
@ -271,8 +274,8 @@ unit_test: $(UNIT_TEST_DIRS)
sim_test: sim_test:
@ $(MAKE) -C trick_sims test @ $(MAKE) -C trick_sims test
requirements: #requirements:
@ $(MAKE) -C trick_test/requirements_docs install # @ $(MAKE) -C trick_test/requirements_docs install
################################################################################ ################################################################################
# CLEAN Targets # CLEAN Targets
@ -337,14 +340,14 @@ clean_java:
# FIXME: Seems to me that the for loop below should be removed and that the # FIXME: Seems to me that the for loop below should be removed and that the
# 'clean' target in trick_sims/makefile should be doing this. --Penn # 'clean' target in trick_sims/makefile should be doing this. --Penn
clean_test: clean_unit_test clean_requirements clean_test: clean_unit_test
-@ $(MAKE) -C trick_sims clean -@ $(MAKE) -C trick_sims clean
@for i in $(MODEL_DIRS) ; do \ @for i in $(MODEL_DIRS) ; do \
cd $$i ; /bin/rm -rf io_src object_* swig xml ; \ cd $$i ; /bin/rm -rf io_src object_* swig xml ; \
done done
clean_requirements: #clean_requirements:
@ $(MAKE) -C trick_test/requirements_docs clean # @ $(MAKE) -C trick_test/requirements_docs clean
clean_stand_alone_utils: clean_stand_alone_utils:
@ $(MAKE) -C ${TRICK_HOME}/trick_source/trick_utils clean_stand_alone @ $(MAKE) -C ${TRICK_HOME}/trick_source/trick_utils clean_stand_alone

9
trick_sims/.gitignore vendored Normal file
View File

@ -0,0 +1,9 @@
DP_rt_*.xml
makefile
S_job_execution
S_run_summary
send_hs
varserver_log
log_*
chkpnt_*
MONTE_RUN_*