Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev/performance #17

Merged
merged 7 commits into from
Nov 8, 2018
Merged

Dev/performance #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c89fa38
Initial submission of benchmark utility. Refactor OpenVeriStandConnec…
csjall Nov 7, 2018
cdd02af
Complete BenchmarkSystemDefinition utility method. Callers can specif…
csjall Nov 8, 2018
9c8d5e8
Add test for BenchmarkSystemDefinition
csjall Nov 8, 2018
b498cd2
Update test to be more permissive. Change formatting on message.
csjall Nov 8, 2018
8da9899
Address review comments from Ryan
csjall Nov 8, 2018
3e55b5c
Updated tests to run on RT target instead of Windows host
csjall Nov 8, 2018
3bc7d10
Separate source from compiled code
csjall Nov 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions VeriStand Test Utilities.lvproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,8 @@
<Item Name="X in Y (Variant)__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 (Variant)__jki_lib_array -- VI Tester__jki_vi_tester.vi"/>
<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="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"/>
<Item Name="DOMUserDefRef.dll" Type="Document" URL="DOMUserDefRef.dll">
Expand All @@ -709,6 +711,7 @@
</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="lvanlys.dll" Type="Document" URL="/&lt;resource&gt;/lvanlys.dll"/>
</Item>
<Item Name="Build Specifications" Type="Build"/>
</Item>
Expand Down
141 changes: 141 additions & 0 deletions VeriStand Test Utilities.lvproj.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
<?xml version ="1.0"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<!-- ================================= GAC files ==================================== -->
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.APIInterface" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.ClientAPI" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.Internal" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.SystemDefinitionAPI" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.SystemStorage" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.SystemStorageUI" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.WorkspaceMacro" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.XMLReader" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.DataTypes" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.ATMLTestResults" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.RealTimeSequenceDefinitionApi" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.UsiDotNetApi" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.RealTimeSequenceDefinitionApiUtilities" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.ASAM.XIL.Implementation.TestBench" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<!-- ================================= Local files ==================================== -->
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.CommonUI" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.Compiler" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.MacroPlayerRecorder" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.ResXResourceManager" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.ServerAPI" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.UIStyleManager" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.DataTypes.Utilities.dll" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Binary file added VeriStandTestCase/BenchmarkSystemDefinition.vi
View file
Open in desktop
Binary file not shown.
Binary file modified VeriStandTestCase/OpenVeriStandConnection.vi
View file
Open in desktop
Binary file not shown.
Binary file modified VeriStandTestCase/SetMultipleChannelValues.vi
View file
Open in desktop
Binary file not shown.
9 changes: 6 additions & 3 deletions VeriStandTestCase/Tests/Unit/Assets/MostlyEmpty.nivssdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<String>MostlyEmpty</String>
</Property>
<Property Name="Version">
<String>1.0.0.1</String>
<String>1.0.0.2</String>
</Property>
<Property Name="Creator">
<String />
Expand All @@ -28,10 +28,10 @@
<Description />
<Properties>
<Property Name="OS">
<String>Windows</String>
<String>PharLap</String>
</Property>
<Property Name="IP Address">
<String />
<String>10.2.104.35</String>
</Property>
<Property Name="Control Loop Processor">
<I32>-2</I32>
Expand Down Expand Up @@ -99,6 +99,9 @@
<Property Name="FPGAScanInterfaceMode">
<U16>0</U16>
</Property>
<Property Name="Timing Source Settings">
<U16>0</U16>
</Property>
</Properties>
<Errors />
<Section Name="Hardware" TypeGUID="775504AB-1485-13A6-560018C1F4E3EEE1">
Expand Down
Loading