From 98c7029b18d34c086402be31db6dd5c594781080 Mon Sep 17 00:00:00 2001
From: Alex Lin <alexander.s.lin@nasa.gov>
Date: Tue, 18 Apr 2017 08:01:50 -0500
Subject: [PATCH] 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.
---
 .../RUN_test/Ref_Logs/bitfB_Darwin_12.trk        | Bin 2384 -> 0 bytes
 .../RUN_test/Ref_Logs/bitfB_Linux_4.1_x86_64.trk | Bin 2384 -> 0 bytes
 .../RUN_test/Ref_Logs/bitfB_Linux_4.4.trk        | Bin 2384 -> 0 bytes
 .../RUN_test/Ref_Logs/bitfB_Linux_4.4_x86_64.trk | Bin 2384 -> 0 bytes
 .../RUN_test/Ref_Logs/bitfB_Linux_4.6.trk        | Bin 2384 -> 0 bytes
 .../RUN_test/Ref_Logs/log_DR_bitfieldsBINARY.trk | Bin 0 -> 2356 bytes
 .../RUN_test/Ref_Logs/log_DR_typesBINARY.trk     | Bin 0 -> 1193 bytes
 .../RUN_test/Ref_Logs/typesB_Darwin_12.trk       | Bin 1207 -> 0 bytes
 .../Ref_Logs/typesB_Linux_4.1_x86_64.trk         | Bin 1207 -> 0 bytes
 .../RUN_test/Ref_Logs/typesB_Linux_4.4.trk       | Bin 1119 -> 0 bytes
 .../Ref_Logs/typesB_Linux_4.4_x86_64.trk         | Bin 1207 -> 0 bytes
 .../RUN_test/Ref_Logs/typesB_Linux_4.6.trk       | Bin 1119 -> 0 bytes
 test/makefile                                    |   7 ++-----
 13 files changed, 2 insertions(+), 5 deletions(-)
 delete mode 100644 test/SIM_test_dr/RUN_test/Ref_Logs/bitfB_Darwin_12.trk
 delete mode 100644 test/SIM_test_dr/RUN_test/Ref_Logs/bitfB_Linux_4.1_x86_64.trk
 delete mode 100644 test/SIM_test_dr/RUN_test/Ref_Logs/bitfB_Linux_4.4.trk
 delete mode 100644 test/SIM_test_dr/RUN_test/Ref_Logs/bitfB_Linux_4.4_x86_64.trk
 delete mode 100644 test/SIM_test_dr/RUN_test/Ref_Logs/bitfB_Linux_4.6.trk
 create mode 100644 test/SIM_test_dr/RUN_test/Ref_Logs/log_DR_bitfieldsBINARY.trk
 create mode 100644 test/SIM_test_dr/RUN_test/Ref_Logs/log_DR_typesBINARY.trk
 delete mode 100644 test/SIM_test_dr/RUN_test/Ref_Logs/typesB_Darwin_12.trk
 delete mode 100644 test/SIM_test_dr/RUN_test/Ref_Logs/typesB_Linux_4.1_x86_64.trk
 delete mode 100644 test/SIM_test_dr/RUN_test/Ref_Logs/typesB_Linux_4.4.trk
 delete mode 100644 test/SIM_test_dr/RUN_test/Ref_Logs/typesB_Linux_4.4_x86_64.trk
 delete mode 100644 test/SIM_test_dr/RUN_test/Ref_Logs/typesB_Linux_4.6.trk

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
deleted file mode 100644
index 299fafa5122692b35edbfed83c303c987064e963..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2384
zcmchX&q~8U5XR%5gJ4CfUVVft)_QO8?9mq}X{4dl!X}Y;YF|U&q>muzsi)oqK@>cA
z@NAsf-QYS-LQgX=Nq6(@em{1md#RIX9Cl8^i{l^&+K}mOs^TJ!)HKgjmQ3OeoZN-S
z4&(vkP#0>bGZl>n`dr-%bY~N0!>|R<?K;ir8k+7JnzO$eB(8Xp>x{$UB!q^O5ExEE
zSPngwbTrj04KE@*yoeC-q6Vg%7HrQI%-`u(<d~X8j;UGXm@1LqLpdp0qlOT%`w$>j
zLwJt7y5;{0R}s~y2vd!UP}Qgim)~-er0{#Yg5o5kmpBROBu+wD;D}7%W$;~=r5gr4
z{4uxVH<+Kn5MJi{7rgP`ih=7e=a3k<4##+3VC+NUcncD?Gwb_s;oRS0EPD7&-uFS=
vw`*c4?rYC^CGHDlg?JYCwdedI?t5k8RovIs_g&og=@H{Y+}HNir?~GAXEghF

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
deleted file mode 100644
index 299fafa5122692b35edbfed83c303c987064e963..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2384
zcmchX&q~8U5XR%5gJ4CfUVVft)_QO8?9mq}X{4dl!X}Y;YF|U&q>muzsi)oqK@>cA
z@NAsf-QYS-LQgX=Nq6(@em{1md#RIX9Cl8^i{l^&+K}mOs^TJ!)HKgjmQ3OeoZN-S
z4&(vkP#0>bGZl>n`dr-%bY~N0!>|R<?K;ir8k+7JnzO$eB(8Xp>x{$UB!q^O5ExEE
zSPngwbTrj04KE@*yoeC-q6Vg%7HrQI%-`u(<d~X8j;UGXm@1LqLpdp0qlOT%`w$>j
zLwJt7y5;{0R}s~y2vd!UP}Qgim)~-er0{#Yg5o5kmpBROBu+wD;D}7%W$;~=r5gr4
z{4uxVH<+Kn5MJi{7rgP`ih=7e=a3k<4##+3VC+NUcncD?Gwb_s;oRS0EPD7&-uFS=
vw`*c4?rYC^CGHDlg?JYCwdedI?t5k8RovIs_g&og=@H{Y+}HNir?~GAXEghF

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
deleted file mode 100644
index 299fafa5122692b35edbfed83c303c987064e963..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2384
zcmchX&q~8U5XR%5gJ4CfUVVft)_QO8?9mq}X{4dl!X}Y;YF|U&q>muzsi)oqK@>cA
z@NAsf-QYS-LQgX=Nq6(@em{1md#RIX9Cl8^i{l^&+K}mOs^TJ!)HKgjmQ3OeoZN-S
z4&(vkP#0>bGZl>n`dr-%bY~N0!>|R<?K;ir8k+7JnzO$eB(8Xp>x{$UB!q^O5ExEE
zSPngwbTrj04KE@*yoeC-q6Vg%7HrQI%-`u(<d~X8j;UGXm@1LqLpdp0qlOT%`w$>j
zLwJt7y5;{0R}s~y2vd!UP}Qgim)~-er0{#Yg5o5kmpBROBu+wD;D}7%W$;~=r5gr4
z{4uxVH<+Kn5MJi{7rgP`ih=7e=a3k<4##+3VC+NUcncD?Gwb_s;oRS0EPD7&-uFS=
vw`*c4?rYC^CGHDlg?JYCwdedI?t5k8RovIs_g&og=@H{Y+}HNir?~GAXEghF

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
deleted file mode 100644
index 299fafa5122692b35edbfed83c303c987064e963..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2384
zcmchX&q~8U5XR%5gJ4CfUVVft)_QO8?9mq}X{4dl!X}Y;YF|U&q>muzsi)oqK@>cA
z@NAsf-QYS-LQgX=Nq6(@em{1md#RIX9Cl8^i{l^&+K}mOs^TJ!)HKgjmQ3OeoZN-S
z4&(vkP#0>bGZl>n`dr-%bY~N0!>|R<?K;ir8k+7JnzO$eB(8Xp>x{$UB!q^O5ExEE
zSPngwbTrj04KE@*yoeC-q6Vg%7HrQI%-`u(<d~X8j;UGXm@1LqLpdp0qlOT%`w$>j
zLwJt7y5;{0R}s~y2vd!UP}Qgim)~-er0{#Yg5o5kmpBROBu+wD;D}7%W$;~=r5gr4
z{4uxVH<+Kn5MJi{7rgP`ih=7e=a3k<4##+3VC+NUcncD?Gwb_s;oRS0EPD7&-uFS=
vw`*c4?rYC^CGHDlg?JYCwdedI?t5k8RovIs_g&og=@H{Y+}HNir?~GAXEghF

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
deleted file mode 100644
index 299fafa5122692b35edbfed83c303c987064e963..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2384
zcmchX&q~8U5XR%5gJ4CfUVVft)_QO8?9mq}X{4dl!X}Y;YF|U&q>muzsi)oqK@>cA
z@NAsf-QYS-LQgX=Nq6(@em{1md#RIX9Cl8^i{l^&+K}mOs^TJ!)HKgjmQ3OeoZN-S
z4&(vkP#0>bGZl>n`dr-%bY~N0!>|R<?K;ir8k+7JnzO$eB(8Xp>x{$UB!q^O5ExEE
zSPngwbTrj04KE@*yoeC-q6Vg%7HrQI%-`u(<d~X8j;UGXm@1LqLpdp0qlOT%`w$>j
zLwJt7y5;{0R}s~y2vd!UP}Qgim)~-er0{#Yg5o5kmpBROBu+wD;D}7%W$;~=r5gr4
z{4uxVH<+Kn5MJi{7rgP`ih=7e=a3k<4##+3VC+NUcncD?Gwb_s;oRS0EPD7&-uFS=
vw`*c4?rYC^CGHDlg?JYCwdedI?t5k8RovIs_g&og=@H{Y+}HNir?~GAXEghF

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
new file mode 100644
index 0000000000000000000000000000000000000000..93049344b085938691028ea0899acd2883baa0b1
GIT binary patch
literal 2356
zcmchX%}T>S5P;*)K~NE^S0AB^vEC~^d+ZC8G}0iout_AI>}%+o_y|IK^3+?QAPOEl
zcs9=LCb&~()7uPe(oMeI`PiAJuaoGu9iF$Z&w?O0hLJv`DlXzkP4Y}-$vED^hx>5Z
zgVBO9)P)-AOhu!C?y38M4iO0t;IivOE;b{b&B!G|(6)9-?lMM&Bd7^SP!W!x9w&}R
zI+|$CglDJ=&rlnl@%!X!MLMjC<nHs&Sf6Ib`ZP1vr)J!q$!Vb)5o*KkLS<Nlx|}+-
z%GZlk+jt=A<AJD=2ck}HhmDiM>El|6BWUk%1nnG-pdN5ECh$-8Tb5-t4Z8SaYUdyD
z{1K*bGw*-kzFmR14#%{b<2sz<M*-sq2F`b2z;<T+6?{~lpD<p!_)b3Wt9agyi8t}Q
q_M8{ud7-QjOYyw+oLAy`Z%n+4=e70y6wf=KVSI__wSDz1p7#%jSoYrl

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..63ca1aba458db0841c7d39bef0ce52e52aceb87a
GIT binary patch
literal 1193
zcmWG3%1qAIH8jxm;b&lA5Cr1l%3{6LiqvGi{L&J=lFZyxMvx#kkl+AfP9RPxs?bX*
zD$z>>$ryqN5Jr|s0?ROAkx2&2umEL1vdDT;z%r~@WWX*kWCO~8^daj>1M6YOB9ji5
z0l666)fr$JkSXXgnP3?%ET(0FWw3=oHduxai)lGv8BnOA+mj2H0fjY)f$X0=u#6~B
z6y#GFNKDfEeTn6O?7#mGj~E#$HQ)XR0nxM3AdfR>2hDPMe(Xz&tJmZM%a<7T9R2eD
ze`NHzVk?kynSprLOc2;<PZeWMQfiDb7+j{*7>K8CQfdq+02vq_P-+asQ;#V%CJhXp
aQECh%Y+h1o%-J&_@P<-jAVK_rQeyxI6rN-N

literal 0
HcmV?d00001

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
deleted file mode 100644
index c032848de1180e353f56a6bd482ae469d6b6ee46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1207
zcmWG3%1qAIH8jxm;b&lA5Cr1l%3{6LiqvGi{L&J=lFZyxMvx#kkl+AfP9RPxs?bX*
zD$z@10&;Y9LGmDsER_V20+Hxa$q*?PpcIIOtSbc~#fn8L6(Yq3lmh8Q)|Cd4V#gwt
z4v_*m9NqC55GjyB=u(*wDK0DqW<jK|g+?|+iVur{IS?sO2&3DT3y}f^JbFOoL8L^X
z&Hz$ikeH<R`x46m*?<2X9x*ahYQFss0-|T5K>@&^9W=}3`LQo8u3nQ5EMH>SbM(vq
z|B=z>imgCSW(ML}GeKadJync3NvSc$U~rjIV<4WoNvScQ0AyfzK&dehPd%p8m^3hW
bMyWB7uz5+TF=x+!z#B@9fdugfN{s;kydj{l

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
deleted file mode 100644
index c032848de1180e353f56a6bd482ae469d6b6ee46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1207
zcmWG3%1qAIH8jxm;b&lA5Cr1l%3{6LiqvGi{L&J=lFZyxMvx#kkl+AfP9RPxs?bX*
zD$z@10&;Y9LGmDsER_V20+Hxa$q*?PpcIIOtSbc~#fn8L6(Yq3lmh8Q)|Cd4V#gwt
z4v_*m9NqC55GjyB=u(*wDK0DqW<jK|g+?|+iVur{IS?sO2&3DT3y}f^JbFOoL8L^X
z&Hz$ikeH<R`x46m*?<2X9x*ahYQFss0-|T5K>@&^9W=}3`LQo8u3nQ5EMH>SbM(vq
z|B=z>imgCSW(ML}GeKadJync3NvSc$U~rjIV<4WoNvScQ0AyfzK&dehPd%p8m^3hW
bMyWB7uz5+TF=x+!z#B@9fdugfN{s;kydj{l

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
deleted file mode 100644
index 940d10b1c953dd963785d1c3f588f1ca5e94b00c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1119
zcmWG3%1qAIH8jxm;b&lA5Cr1l%3{6LiqvGi{L&J=lFZyxMvx#kkl+AfP9RPxs?bX*
zD$z@10&;Y9LGmDsER_V20+Hxa$q*?PpcIIOtSbc~#fn8L6(Yq3lmh8Q)|Cd4V#gwt
z4v_*m99>riL<(dOx>P1aiVKTW7DNhLXk<gA_<*|511bk11qxwwsa%K@DB#fpDi0zh
z3UvmM0)xaPz2BEu4#@ud@9>C`p;Ghhf6=qi?Ak%IT%I5M(&Fkh`M~lehCN5W{Qn;r
zeXiIF<Wy!Lo;4E$cG^><{Uo{CjltkDx!NI)ze%okNWeWHS3AV<kIB`Z1_sZ_)eiCd
VOLDcJJp%%7$kh%Bx)0=P2LKbHbkqO<

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
deleted file mode 100644
index c032848de1180e353f56a6bd482ae469d6b6ee46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1207
zcmWG3%1qAIH8jxm;b&lA5Cr1l%3{6LiqvGi{L&J=lFZyxMvx#kkl+AfP9RPxs?bX*
zD$z@10&;Y9LGmDsER_V20+Hxa$q*?PpcIIOtSbc~#fn8L6(Yq3lmh8Q)|Cd4V#gwt
z4v_*m9NqC55GjyB=u(*wDK0DqW<jK|g+?|+iVur{IS?sO2&3DT3y}f^JbFOoL8L^X
z&Hz$ikeH<R`x46m*?<2X9x*ahYQFss0-|T5K>@&^9W=}3`LQo8u3nQ5EMH>SbM(vq
z|B=z>imgCSW(ML}GeKadJync3NvSc$U~rjIV<4WoNvScQ0AyfzK&dehPd%p8m^3hW
bMyWB7uz5+TF=x+!z#B@9fdugfN{s;kydj{l

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
deleted file mode 100644
index 940d10b1c953dd963785d1c3f588f1ca5e94b00c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1119
zcmWG3%1qAIH8jxm;b&lA5Cr1l%3{6LiqvGi{L&J=lFZyxMvx#kkl+AfP9RPxs?bX*
zD$z@10&;Y9LGmDsER_V20+Hxa$q*?PpcIIOtSbc~#fn8L6(Yq3lmh8Q)|Cd4V#gwt
z4v_*m99>riL<(dOx>P1aiVKTW7DNhLXk<gA_<*|511bk11qxwwsa%K@DB#fpDi0zh
z3UvmM0)xaPz2BEu4#@ud@9>C`p;Ghhf6=qi?Ak%IT%I5M(&Fkh`M~lehCN5W{Qn;r
zeXiIF<Wy!Lo;4E$cG^><{Uo{CjltkDx!NI)ze%okNWeWHS3AV<kIB`Z1_sZ_)eiCd
VOLDcJJp%%7$kh%Bx)0=P2LKbHbkqO<

diff --git a/test/makefile b/test/makefile
index 64981273..b56b4d2c 100644
--- 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