Unit test for SIM_test_dr failing. #411

This tst was only run if the HOST_CPU of the run matched one of the pre-existing files. So it was only tested on SL6. Found that the udunits change never made it to these log files. I updated the units and introduced only one copy of the files that all platforms will test against.
nasa · Apr 18, 2017 · 98c7029 · 98c7029
1 parent 3affc20
commit 98c7029
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 5 deletions.
diff --git a/test/SIM_test_dr/RUN_test/Ref_Logs/bitfB_Darwin_12.trk b/test/SIM_test_dr/RUN_test/Ref_Logs/bitfB_Darwin_12.trk
diff --git a/test/SIM_test_dr/RUN_test/Ref_Logs/bitfB_Linux_4.1_x86_64.trk b/test/SIM_test_dr/RUN_test/Ref_Logs/bitfB_Linux_4.1_x86_64.trk
diff --git a/test/SIM_test_dr/RUN_test/Ref_Logs/bitfB_Linux_4.4.trk b/test/SIM_test_dr/RUN_test/Ref_Logs/bitfB_Linux_4.4.trk
diff --git a/test/SIM_test_dr/RUN_test/Ref_Logs/bitfB_Linux_4.4_x86_64.trk b/test/SIM_test_dr/RUN_test/Ref_Logs/bitfB_Linux_4.4_x86_64.trk
diff --git a/test/SIM_test_dr/RUN_test/Ref_Logs/bitfB_Linux_4.6.trk b/test/SIM_test_dr/RUN_test/Ref_Logs/bitfB_Linux_4.6.trk
diff --git a/test/SIM_test_dr/RUN_test/Ref_Logs/log_DR_bitfieldsBINARY.trk b/test/SIM_test_dr/RUN_test/Ref_Logs/log_DR_bitfieldsBINARY.trk
diff --git a/test/SIM_test_dr/RUN_test/Ref_Logs/log_DR_typesBINARY.trk b/test/SIM_test_dr/RUN_test/Ref_Logs/log_DR_typesBINARY.trk
diff --git a/test/SIM_test_dr/RUN_test/Ref_Logs/typesB_Darwin_12.trk b/test/SIM_test_dr/RUN_test/Ref_Logs/typesB_Darwin_12.trk
diff --git a/test/SIM_test_dr/RUN_test/Ref_Logs/typesB_Linux_4.1_x86_64.trk b/test/SIM_test_dr/RUN_test/Ref_Logs/typesB_Linux_4.1_x86_64.trk
diff --git a/test/SIM_test_dr/RUN_test/Ref_Logs/typesB_Linux_4.4.trk b/test/SIM_test_dr/RUN_test/Ref_Logs/typesB_Linux_4.4.trk
diff --git a/test/SIM_test_dr/RUN_test/Ref_Logs/typesB_Linux_4.4_x86_64.trk b/test/SIM_test_dr/RUN_test/Ref_Logs/typesB_Linux_4.4_x86_64.trk
diff --git a/test/SIM_test_dr/RUN_test/Ref_Logs/typesB_Linux_4.6.trk b/test/SIM_test_dr/RUN_test/Ref_Logs/typesB_Linux_4.6.trk
diff --git a/test/makefile b/test/makefile
@@ -57,9 +57,6 @@ DR_RESULTS = $(TRICK_HOME)/test/SIM_test_dr/RUN_test
 data_record_results: $(TRICK_HOME)/trick_test/SIM_test_dr.xml $(DR_RESULTS)
 	diff $(DR_RESULTS)/log_DR_bitfieldsASCII.csv $(DR_RESULTS)/Ref_Logs/log_DR_bitfieldsASCII_Master.csv
 	diff $(DR_RESULTS)/log_DR_typesASCII.csv $(DR_RESULTS)/Ref_Logs/log_DR_typesASCII_Master.csv
-ifneq ($(wildcard $(DR_RESULTS)/Ref_Logs/typesB_${TRICK_HOST_CPU}.trk), )
-	cmp -b $(DR_RESULTS)/log_DR_bitfieldsBINARY.trk $(DR_RESULTS)/Ref_Logs/bitfB_${TRICK_HOST_CPU}.trk
-	cmp -b $(DR_RESULTS)/log_DR_typesBINARY.trk $(DR_RESULTS)/Ref_Logs/typesB_${TRICK_HOST_CPU}.trk
-endif
-
+	cmp -b $(DR_RESULTS)/log_DR_bitfieldsBINARY.trk $(DR_RESULTS)/Ref_Logs/log_DR_bitfieldsBINARY.trk
+	cmp -b $(DR_RESULTS)/log_DR_typesBINARY.trk $(DR_RESULTS)/Ref_Logs/log_DR_typesBINARY.trk