diff --git a/Makefile b/Makefile index c103f5ba..d8dfe2f2 100644 --- a/Makefile +++ b/Makefile @@ -127,34 +127,6 @@ ifeq ($(USE_ER7_UTILS), 0) UNIT_TEST_DIRS := $(filter-out %Integrator/test,$(UNIT_TEST_DIRS)) endif -#------------------------------------------------------------------------------- -# FIXME: -# This is only used by the 'clean_test' target below. Seems to me that it really -# doesn't belong here. Instead, the 'clean' target in -# $TRICK_HOME/trick_sims/makefile define this. -#------------------------------------------------------------------------------- -MODEL_DIRS = \ - ${TRICK_HOME}/trick_models/Ball++/L1 \ - ${TRICK_HOME}/trick_models/ball/L1 \ - ${TRICK_HOME}/trick_models/ball/L2 \ - ${TRICK_HOME}/trick_models/baseball/aero \ - ${TRICK_HOME}/trick_models/baseball/optim \ - ${TRICK_HOME}/trick_models/cannon/aero \ - ${TRICK_HOME}/trick_models/cannon/graphics \ - ${TRICK_HOME}/trick_models/cannon/gravity \ - ${TRICK_HOME}/trick_models/cannon/optim \ - ${TRICK_HOME}/trick_models/exclude_me \ - ${TRICK_HOME}/trick_models/helios \ - ${TRICK_HOME}/trick_models/stl_checkpoint \ - ${TRICK_HOME}/trick_models/target \ - ${TRICK_HOME}/trick_models/test/dp \ - ${TRICK_HOME}/trick_models/test/impexp \ - ${TRICK_HOME}/trick_models/test/ip \ - ${TRICK_HOME}/trick_models/test/ip2 \ - ${TRICK_HOME}/trick_models/test/sched \ - ${TRICK_HOME}/trick_models/test_ip \ - ${TRICK_HOME}/trick_models/threads - # The name of the ICG executable indicates the operating system, and the machine # hardware on which it is built. This allows pre-build ICG binaries to be # distributed in the installation package. The reason for distributing pre-built @@ -352,9 +324,7 @@ clean_java: # 'clean' target in trick_sims/makefile should be doing this. --Penn clean_test: clean_unit_test -@ $(MAKE) -C trick_sims clean - @for i in $(MODEL_DIRS) ; do \ - cd $$i ; /bin/rm -rf io_src object_* swig xml ; \ - done + -@ $(MAKE) -C test clean clean_gui: clean_java diff --git a/trick_sims/SIM_threads/RUN_test/Title b/test/SIM_threads/RUN_test/Title similarity index 100% rename from trick_sims/SIM_threads/RUN_test/Title rename to test/SIM_threads/RUN_test/Title diff --git a/trick_sims/SIM_threads/RUN_test/amf.py b/test/SIM_threads/RUN_test/amf.py similarity index 100% rename from trick_sims/SIM_threads/RUN_test/amf.py rename to test/SIM_threads/RUN_test/amf.py diff --git a/trick_sims/SIM_threads/RUN_test/async.py b/test/SIM_threads/RUN_test/async.py similarity index 100% rename from trick_sims/SIM_threads/RUN_test/async.py rename to test/SIM_threads/RUN_test/async.py diff --git a/trick_sims/SIM_threads/RUN_test/input.py b/test/SIM_threads/RUN_test/input.py similarity index 100% rename from trick_sims/SIM_threads/RUN_test/input.py rename to test/SIM_threads/RUN_test/input.py diff --git a/trick_sims/SIM_threads/RUN_test/overrun.py b/test/SIM_threads/RUN_test/overrun.py similarity index 100% rename from trick_sims/SIM_threads/RUN_test/overrun.py rename to test/SIM_threads/RUN_test/overrun.py diff --git a/trick_sims/SIM_threads/RUN_test/sched.py b/test/SIM_threads/RUN_test/sched.py similarity index 100% rename from trick_sims/SIM_threads/RUN_test/sched.py rename to test/SIM_threads/RUN_test/sched.py diff --git a/trick_sims/SIM_threads/RUN_test/unit_test.py b/test/SIM_threads/RUN_test/unit_test.py similarity index 100% rename from trick_sims/SIM_threads/RUN_test/unit_test.py rename to test/SIM_threads/RUN_test/unit_test.py diff --git a/trick_sims/SIM_threads/S_define b/test/SIM_threads/S_define similarity index 100% rename from trick_sims/SIM_threads/S_define rename to test/SIM_threads/S_define diff --git a/test/SIM_threads/S_overrides.mk b/test/SIM_threads/S_overrides.mk new file mode 100644 index 00000000..27536a3b --- /dev/null +++ b/test/SIM_threads/S_overrides.mk @@ -0,0 +1,4 @@ + +TRICK_CFLAGS += -I./models +TRICK_CXXFLAGS += -I./models + diff --git a/trick_sims/SIM_threads/Title b/test/SIM_threads/Title similarity index 100% rename from trick_sims/SIM_threads/Title rename to test/SIM_threads/Title diff --git a/trick_models/threads/include/Thread1.h b/test/SIM_threads/models/threads/include/Thread1.h similarity index 100% rename from trick_models/threads/include/Thread1.h rename to test/SIM_threads/models/threads/include/Thread1.h diff --git a/trick_models/threads/include/Thread2.h b/test/SIM_threads/models/threads/include/Thread2.h similarity index 100% rename from trick_models/threads/include/Thread2.h rename to test/SIM_threads/models/threads/include/Thread2.h diff --git a/trick_models/threads/include/Thread3.h b/test/SIM_threads/models/threads/include/Thread3.h similarity index 100% rename from trick_models/threads/include/Thread3.h rename to test/SIM_threads/models/threads/include/Thread3.h diff --git a/trick_models/threads/src/Thread1.cpp b/test/SIM_threads/models/threads/src/Thread1.cpp similarity index 100% rename from trick_models/threads/src/Thread1.cpp rename to test/SIM_threads/models/threads/src/Thread1.cpp diff --git a/trick_models/threads/src/Thread2.cpp b/test/SIM_threads/models/threads/src/Thread2.cpp similarity index 100% rename from trick_models/threads/src/Thread2.cpp rename to test/SIM_threads/models/threads/src/Thread2.cpp diff --git a/trick_models/threads/src/Thread3.cpp b/test/SIM_threads/models/threads/src/Thread3.cpp similarity index 100% rename from trick_models/threads/src/Thread3.cpp rename to test/SIM_threads/models/threads/src/Thread3.cpp diff --git a/trick_sims/SIM_threads/overrun.tv b/test/SIM_threads/overrun.tv similarity index 100% rename from trick_sims/SIM_threads/overrun.tv rename to test/SIM_threads/overrun.tv diff --git a/trick_sims/SIM_threads_simple/RUN_test/async.py b/test/SIM_threads_simple/RUN_test/async.py similarity index 100% rename from trick_sims/SIM_threads_simple/RUN_test/async.py rename to test/SIM_threads_simple/RUN_test/async.py diff --git a/trick_sims/SIM_threads_simple/RUN_test/input.py b/test/SIM_threads_simple/RUN_test/input.py similarity index 100% rename from trick_sims/SIM_threads_simple/RUN_test/input.py rename to test/SIM_threads_simple/RUN_test/input.py diff --git a/trick_sims/SIM_threads_simple/RUN_test/sched.py b/test/SIM_threads_simple/RUN_test/sched.py similarity index 100% rename from trick_sims/SIM_threads_simple/RUN_test/sched.py rename to test/SIM_threads_simple/RUN_test/sched.py diff --git a/trick_sims/SIM_threads_simple/S_define b/test/SIM_threads_simple/S_define similarity index 100% rename from trick_sims/SIM_threads_simple/S_define rename to test/SIM_threads_simple/S_define diff --git a/trick_sims/SIM_threads/S_overrides.mk b/test/SIM_threads_simple/S_overrides.mk similarity index 100% rename from trick_sims/SIM_threads/S_overrides.mk rename to test/SIM_threads_simple/S_overrides.mk diff --git a/trick_sims/SIM_threads_simple/Title b/test/SIM_threads_simple/Title similarity index 100% rename from trick_sims/SIM_threads_simple/Title rename to test/SIM_threads_simple/Title diff --git a/trick_sims/SIM_threads_simple/S_overrides.mk b/trick_sims/SIM_threads_simple/S_overrides.mk deleted file mode 100644 index 8fa02be5..00000000 --- a/trick_sims/SIM_threads_simple/S_overrides.mk +++ /dev/null @@ -1,4 +0,0 @@ - -TRICK_CFLAGS += -I${TRICK_HOME}/trick_models -TRICK_CXXFLAGS += -I${TRICK_HOME}/trick_models - diff --git a/trick_sims/makefile b/trick_sims/makefile index 1acc4d87..ee07f239 100644 --- a/trick_sims/makefile +++ b/trick_sims/makefile @@ -32,8 +32,6 @@ COMPILE_DIRS = SIM_Ball++_L1 \ SIM_test_ip2 \ SIM_test_sched \ SIM_test_simlib \ - SIM_threads \ - SIM_threads_simple \ SIM_trickcomm # This test is temporarily sitting out until fixed. @@ -63,8 +61,7 @@ TEST_DIRS = SIM_Ball++_L1 \ SIM_test_dp \ SIM_test_dr \ SIM_test_sched \ - SIM_test_simlib \ - SIM_threads + SIM_test_simlib # This test is temporarily sitting out until fixed. # SIM_test_varserv