Merge pull request #466 from nasa/MakeCleanFix

Added more test directories to "make clean".
This commit is contained in:
Christopher LaChance 2017-08-14 09:43:31 -05:00 committed by GitHub
commit bc50836e22

View File

@ -3,27 +3,27 @@ export TRICK_HOST_CPU := $(shell $(TRICK_HOME)/bin/trick-gte TRICK_HOST_CPU)
# List out sims we want to compile
COMPILE_DIRS = \
SIM_demo_sdefine \
SIM_events \
SIM_rti \
SIM_stls \
SIM_test_dp \
SIM_test_dr \
SIM_test_io \
SIM_test_ip \
SIM_test_sched \
SIM_test_templates \
SIM_threads
SIM_demo_sdefine \
SIM_events \
SIM_rti \
SIM_stls \
SIM_test_dp \
SIM_test_dr \
SIM_test_io \
SIM_test_ip \
SIM_test_sched \
SIM_test_templates \
SIM_threads
SIMS_NEEDING_TEST = \
SIM_alloc_test \
SIM_demo_inputfile \
SIM_measurement_units \
SIM_test_abstract \
SIM_test_inherit \
SIM_test_ip2 \
SIM_threads_simple \
SIM_trickcomm
SIM_alloc_test \
SIM_demo_inputfile \
SIM_measurement_units \
SIM_test_abstract \
SIM_test_inherit \
SIM_test_ip2 \
SIM_threads_simple \
SIM_trickcomm
# Sims with problems, no purpose, or maybe shouldn't be a test
# SIM_leaks ( should be deleted )
@ -42,10 +42,16 @@ test: $(EXECUTABLES) $(UNIT_TEST_RESULTS) data_record_results
clean:
rm -f $(UNIT_TEST_RESULTS)
- for i in $(COMPILE_DIRS) ; do \
if [ -f "$$i/"[Mm]"akefile" ] ; then \
$(MAKE) -C $$i spotless ; \
fi \
done
if [ -f "$$i/"[Mm]"akefile" ] ; then \
$(MAKE) -C $$i spotless ; \
fi \
done
- for i in $(SIMS_NEEDING_TEST) ; do \
if [ -f "$$i/"[Mm]"akefile" ] ; then \
$(MAKE) -C $$i spotless ; \
fi \
done
$(EXECUTABLES):
@ cd $(@D) ; ${TRICK_HOME}/bin/trick-CP -t