ni · rtzoeller · Nov 12, 2018 · Nov 6, 2018 · Nov 6, 2018 · Nov 6, 2018
diff --git a/VeriStand Test Utilities.lvproj b/VeriStand Test Utilities.lvproj
@@ -51,7 +51,6 @@
 				<Item Name="Build Path - Traditional__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/Build Path - Traditional__ogtk.vi"/>
 				<Item Name="Build Path__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/Build Path__ogtk.vi"/>
 				<Item Name="Create Dir if Non-Existant__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/Create Dir if Non-Existant__ogtk.vi"/>
-				<Item Name="Current VIs Parent Directory__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/Current VIs Parent Directory__ogtk.vi"/>
 				<Item Name="Current VIs Parents Ref__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/appcontrol/appcontrol.llb/Current VIs Parents Ref__ogtk.vi"/>
 				<Item Name="Delete Elements from 1D Array (Boolean)__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/array/array.llb/Delete Elements from 1D Array (Boolean)__ogtk.vi"/>
 				<Item Name="Delete Elements from 1D Array (CDB)__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/array/array.llb/Delete Elements from 1D Array (CDB)__ogtk.vi"/>
@@ -132,9 +131,6 @@
 				<Item Name="Empty 2D Array (Variant)__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/array/array.llb/Empty 2D Array (Variant)__ogtk.vi"/>
 				<Item Name="Empty Array (Variant)__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/array/array.llb/Empty Array (Variant)__ogtk.vi"/>
 				<Item Name="Empty Array__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/array/array.llb/Empty Array__ogtk.vi"/>
-				<Item Name="File Exists - Array__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/File Exists - Array__ogtk.vi"/>
-				<Item Name="File Exists - Scalar__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/File Exists - Scalar__ogtk.vi"/>
-				<Item Name="File Exists__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/File Exists__ogtk.vi"/>
 				<Item Name="Filter 1D Array (Boolean)__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/array/array.llb/Filter 1D Array (Boolean)__ogtk.vi"/>
 				<Item Name="Filter 1D Array (CDB)__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/array/array.llb/Filter 1D Array (CDB)__ogtk.vi"/>
 				<Item Name="Filter 1D Array (CSG)__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/array/array.llb/Filter 1D Array (CSG)__ogtk.vi"/>
@@ -322,6 +318,10 @@
 				<Item Name="Valid Path - Traditional__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/Valid Path - Traditional__ogtk.vi"/>
 				<Item Name="Variant to Header Info__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Variant to Header Info__ogtk.vi"/>
 				<Item Name="Waveform Subtype Enum__ogtk.ctl" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Waveform Subtype Enum__ogtk.ctl"/>
+				<Item Name="Current VIs Parent Directory__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/Current VIs Parent Directory__ogtk.vi"/>
+				<Item Name="File Exists - Scalar__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/File Exists - Scalar__ogtk.vi"/>
+				<Item Name="File Exists - Array__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/File Exists - Array__ogtk.vi"/>
+				<Item Name="File Exists__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/File Exists__ogtk.vi"/>
 			</Item>
 			<Item Name="vi.lib" Type="Folder">
 				<Item Name="8.6CompatibleGlobalVar.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/config.llb/8.6CompatibleGlobalVar.vi"/>
@@ -379,7 +379,7 @@
 				<Item Name="Convert EOLs (String Array)__ogtk__jki_vi_tester.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Convert EOLs (String Array)__ogtk__jki_vi_tester.vi"/>
 				<Item Name="Convert EOLs (String)__ogtk__jki_vi_tester.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Convert EOLs (String)__ogtk__jki_vi_tester.vi"/>
 				<Item Name="Convert EOLs__ogtk__jki_vi_tester.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Convert EOLs__ogtk__jki_vi_tester.vi"/>
-				<Item Name="Custom Device API.lvlib" Type="Library" URL="/&lt;vilib&gt;/NI VeriStand/Custom Device API/Custom Device API.lvlib"/>
+				<Item Name="Custom Device API.lvlib" Type="Library" URL="/&lt;vilib&gt;/NI Veristand/Custom Device API/Custom Device API.lvlib"/>
 				<Item Name="Date Type Format String Mapping__JKI EasyXML.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/EasyXML/JKI_EasyXML.llb/Date Type Format String Mapping__JKI EasyXML.vi"/>
 				<Item Name="Delete Elements from 1D Array (Boolean)__ogtk__jki_vi_tester.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Delete Elements from 1D Array (Boolean)__ogtk__jki_vi_tester.vi"/>
 				<Item Name="Delete Elements from 1D Array (CDB)__ogtk__jki_vi_tester.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Delete Elements from 1D Array (CDB)__ogtk__jki_vi_tester.vi"/>
@@ -517,7 +517,6 @@
 				<Item Name="NI_VS Workspace ExecutionAPI.lvlib" Type="Library" URL="/&lt;vilib&gt;/NI VeriStand/Execution/Workspace/NI_VS Workspace ExecutionAPI.lvlib"/>
 				<Item Name="NI_XML.lvlib" Type="Library" URL="/&lt;vilib&gt;/xml/NI_XML.lvlib"/>
 				<Item Name="nisyscfg.lvlib" Type="Library" URL="/&lt;vilib&gt;/nisyscfg/nisyscfg.lvlib"/>
-				<Item Name="PackedMatrixToFlatVector.vi" Type="VI" URL="/&lt;vilib&gt;/NI Veristand/Execution/Shared/PackedMatrixToFlatVector.vi"/>
 				<Item Name="Random Number - Within Range__ogtk__jki_vi_tester.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Random Number - Within Range__ogtk__jki_vi_tester.vi"/>
 				<Item Name="Recursive File List.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/libraryn.llb/Recursive File List.vi"/>
 				<Item Name="Remove Duplicates from 1D Array (Boolean)__ogtk__jki_vi_tester.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Remove Duplicates from 1D Array (Boolean)__ogtk__jki_vi_tester.vi"/>
@@ -669,7 +668,6 @@
 				<Item Name="Type Descriptor Enumeration__ogtk__jki_vi_tester.ctl" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Type Descriptor Enumeration__ogtk__jki_vi_tester.ctl"/>
 				<Item Name="Type Descriptor Header__ogtk__jki_vi_tester.ctl" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Type Descriptor Header__ogtk__jki_vi_tester.ctl"/>
 				<Item Name="Type Descriptor__ogtk__jki_vi_tester.ctl" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Type Descriptor__ogtk__jki_vi_tester.ctl"/>
-				<Item Name="UnpackedFlatVectorToMatrix.vi" Type="VI" URL="/&lt;vilib&gt;/NI Veristand/Execution/Shared/UnpackedFlatVectorToMatrix.vi"/>
 				<Item Name="Valid Path - Array__ogtk__jki_vi_tester.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Valid Path - Array__ogtk__jki_vi_tester.vi"/>
 				<Item Name="Valid Path - Traditional__ogtk__jki_vi_tester.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Valid Path - Traditional__ogtk__jki_vi_tester.vi"/>
 				<Item Name="Valid Path__ogtk__jki_vi_tester.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/Valid Path__ogtk__jki_vi_tester.vi"/>
@@ -685,6 +683,8 @@
 				<Item Name="X in Y__jki_lib_array -- VI Tester__jki_vi_tester.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/VI Tester/_support/Support.llb/X in Y__jki_lib_array -- VI Tester__jki_vi_tester.vi"/>
 				<Item Name="XML Build Entity__JKI EasyXML.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/EasyXML/JKI_EasyXML.llb/XML Build Entity__JKI EasyXML.vi"/>
 				<Item Name="Is Path and Not Empty.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/file.llb/Is Path and Not Empty.vi"/>
+				<Item Name="PackedMatrixToFlatVector.vi" Type="VI" URL="/&lt;vilib&gt;/NI Veristand/Execution/Shared/PackedMatrixToFlatVector.vi"/>
+				<Item Name="UnpackedFlatVectorToMatrix.vi" Type="VI" URL="/&lt;vilib&gt;/NI Veristand/Execution/Shared/UnpackedFlatVectorToMatrix.vi"/>
 				<Item Name="NI_AALBase.lvlib" Type="Library" URL="/&lt;vilib&gt;/Analysis/NI_AALBase.lvlib"/>
 			</Item>
 			<Item Name="CoreOperation.lvclass" Type="LVClass" URL="/&lt;nishared&gt;/LabVIEW CLI/Operations/CoreOperation/CoreOperation.lvclass"/>
@@ -711,6 +711,9 @@
 			</Item>
 			<Item Name="OperationErrorType.ctl" Type="VI" URL="/&lt;nishared&gt;/LabVIEW CLI/Operations/Utilities/OperationErrorType.ctl"/>
 			<Item Name="Verbosity.ctl" Type="VI" URL="/&lt;nishared&gt;/LabVIEW CLI/Operations/Utilities/Verbosity.ctl"/>
+			<Item Name="NationalInstruments.VeriStand.SystemStorage" Type="Document" URL="NationalInstruments.VeriStand.SystemStorage">
+				<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
+			</Item>
 			<Item Name="lvanlys.dll" Type="Document" URL="/&lt;resource&gt;/lvanlys.dll"/>
 		</Item>
 		<Item Name="Build Specifications" Type="Build"/>

diff --git a/VeriStandTestCase/BenchmarkSystemDefinition.vi b/VeriStandTestCase/BenchmarkSystemDefinition.vi
diff --git a/VeriStandTestCase/GetProperty.vi b/VeriStandTestCase/GetProperty.vi
diff --git a/VeriStandTestCase/OpenVeriStandConnection.vi b/VeriStandTestCase/OpenVeriStandConnection.vi
diff --git a/VeriStandTestCase/Tests/Unit/Assets/MostlyEmptyOverrides.ini b/VeriStandTestCase/Tests/Unit/Assets/MostlyEmptyOverrides.ini
@@ -0,0 +1,2 @@
+[Properties]
+"Dummy Property" = "Dummy Value"
diff --git a/VeriStandTestCase/Tests/Unit/testOpenCloseVeriStandConnection.vi b/VeriStandTestCase/Tests/Unit/testOpenCloseVeriStandConnection.vi
diff --git a/VeriStandTestCase/Utilities/PatchSystemDefinitionFile.vi b/VeriStandTestCase/Utilities/PatchSystemDefinitionFile.vi
diff --git a/VeriStandTestCase/VeriStandTestCase.lvclass b/VeriStandTestCase/VeriStandTestCase.lvclass
diff --git a/VeriStandTestUtilities/OverrideItem.ctl → ...StandTestUtilities/ConfigOverrideItem.ctl b/VeriStandTestUtilities/OverrideItem.ctl → ...StandTestUtilities/ConfigOverrideItem.ctl
diff --git a/VeriStandTestUtilities/ConfigPropertyItem.ctl b/VeriStandTestUtilities/ConfigPropertyItem.ctl
diff --git a/VeriStandTestUtilities/ConfigureTarget.vi b/VeriStandTestUtilities/ConfigureTarget.vi
diff --git a/VeriStandTestUtilities/ConvertSystemDefinitionPropertyTypeToEnum.vi b/VeriStandTestUtilities/ConvertSystemDefinitionPropertyTypeToEnum.vi
diff --git a/VeriStandTestUtilities/GenerateOverriddenSystemDefinition.vi b/VeriStandTestUtilities/GenerateOverriddenSystemDefinition.vi
diff --git a/VeriStandTestUtilities/GetSystemDefinitionNodeByName.vi b/VeriStandTestUtilities/GetSystemDefinitionNodeByName.vi
diff --git a/VeriStandTestUtilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValue.vi b/VeriStandTestUtilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValue.vi
diff --git a/...tilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValueErrorMessage.vi b/...tilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValueErrorMessage.vi
diff --git a/...ndTestUtilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValue_Bool.vi b/...ndTestUtilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValue_Bool.vi
diff --git a/...TestUtilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValue_Double.vi b/...TestUtilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValue_Double.vi
diff --git a/...andTestUtilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValue_I16.vi b/...andTestUtilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValue_I16.vi
diff --git a/...andTestUtilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValue_I32.vi b/...andTestUtilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValue_I32.vi
diff --git a/...andTestUtilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValue_I64.vi b/...andTestUtilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValue_I64.vi
diff --git a/...TestUtilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValue_String.vi b/...TestUtilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValue_String.vi
diff --git a/...andTestUtilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValue_U16.vi b/...andTestUtilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValue_U16.vi
diff --git a/...andTestUtilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValue_U32.vi b/...andTestUtilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValue_U32.vi
diff --git a/...andTestUtilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValue_U64.vi b/...andTestUtilities/GetSystemDefinitionPropertyValue/GetSystemDefinitionPropertyValue_U64.vi
diff --git a/...tilities/GetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValueErrorMessage.vi b/...tilities/GetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValueErrorMessage.vi
diff --git a/VeriStandTestUtilities/ParseSystemDefinitionFile.vi b/VeriStandTestUtilities/ParseSystemDefinitionFile.vi
diff --git a/VeriStandTestUtilities/QueryCustomDevices.vi b/VeriStandTestUtilities/QueryCustomDevices.vi
diff --git a/VeriStandTestUtilities/QueryDAQHardware.vi b/VeriStandTestUtilities/QueryDAQHardware.vi
diff --git a/VeriStandTestUtilities/QueryHardware.vi b/VeriStandTestUtilities/QueryHardware.vi
diff --git a/VeriStandTestUtilities/QueryTarget.vi b/VeriStandTestUtilities/QueryTarget.vi
diff --git a/VeriStandTestUtilities/QueryTimingAndSyncHardware.vi b/VeriStandTestUtilities/QueryTimingAndSyncHardware.vi
diff --git a/VeriStandTestUtilities/ReadSystemDefinitionOverrideFile.vi b/VeriStandTestUtilities/ReadSystemDefinitionOverrideFile.vi
diff --git a/VeriStandTestUtilities/SaveSystemDefinitionFile.vi b/VeriStandTestUtilities/SaveSystemDefinitionFile.vi
diff --git a/VeriStandTestUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValue.vi b/VeriStandTestUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValue.vi
diff --git a/...tUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValueFromString.vi b/...tUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValueFromString.vi
diff --git a/...ndTestUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValue_Bool.vi b/...ndTestUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValue_Bool.vi
diff --git a/...TestUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValue_Double.vi b/...TestUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValue_Double.vi
diff --git a/...andTestUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValue_I16.vi b/...andTestUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValue_I16.vi
diff --git a/...andTestUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValue_I32.vi b/...andTestUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValue_I32.vi
diff --git a/...andTestUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValue_I64.vi b/...andTestUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValue_I64.vi
diff --git a/...TestUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValue_String.vi b/...TestUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValue_String.vi
diff --git a/...andTestUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValue_U16.vi b/...andTestUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValue_U16.vi
diff --git a/...andTestUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValue_U32.vi b/...andTestUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValue_U32.vi
diff --git a/...andTestUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValue_U64.vi b/...andTestUtilities/SetSystemDefinitionPropertyValue/SetSystemDefinitionPropertyValue_U64.vi
diff --git a/VeriStandTestUtilities/SystemDefinitionPropertyType.ctl b/VeriStandTestUtilities/SystemDefinitionPropertyType.ctl
diff --git a/VeriStandTestUtilities/Tests/Unit/Assets/GenerateOverriddenSystemDefinitionOverrides.ini b/VeriStandTestUtilities/Tests/Unit/Assets/GenerateOverriddenSystemDefinitionOverrides.ini
@@ -0,0 +1,7 @@
+[Overrides]
+"Targets/Controller/IP Address" = "10.2.64.29"
+"Aliases/DoNotAllowUnmappedAliases" = "false"
+
+[Properties]
+"FPGA Loopback IP" = "10.2.64.30"
+"Custom Timeout" = "120"