Skip to content

Commit

Permalink
Add support for multi-platform system tests (#169)
Browse files Browse the repository at this point in the history 
This pull request uses the latest changes to the testing tools to implement multi-platform system tests. This required:
- adding targets.ini files to each system test class directory
- updating the system definitions to reflect the latest changes to the custom device
- removing the old system test (which assumed all others executed only on Windows)
  • Loading branch information
@Karl-G1
Karl-G1 authored Dec 11, 2019
1 parent 13bb6e0 commit 429389e
Show file tree
Hide file tree
Showing 13 changed files with 429 additions and 2,176 deletions.
1 change: 0 additions & 1 deletion Source/Routing and Faulting/Routing and Faulting Custom Device.lvproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@
<Item Name="Switch_and_RaF_Rich_States.nivssdf" Type="Document" URL="../Tests/System/Assets/Switch_and_RaF_Rich_States.nivssdf"/>
<Item Name="Switch_No_RaF.nivssdf" Type="Document" URL="../Tests/System/Assets/Switch_No_RaF.nivssdf"/>
<Item Name="Switch_and_RaF_Invalid_Switch_Resource.nivssdf" Type="Document" URL="../Tests/System/Assets/Switch_and_RaF_Invalid_Switch_Resource.nivssdf"/>
<Item Name="Switch_and_RaF_RT.nivssdf" Type="Document" URL="../Tests/System/Assets/Switch_and_RaF_RT.nivssdf"/>
</Item>
<Item Name="Routing and Faulting System Tests.lvclass" Type="LVClass" URL="../Tests/System/Routing and Faulting System Tests.lvclass"/>
</Item>
Expand Down
67 changes: 62 additions & 5 deletions Source/Routing and Faulting/Tests/System/Assets/Switch_No_RaF.nivssdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<String>Switch_No_RaF</String>
</Property>
<Property Name="Version">
<String>1.0.0.1</String>
<String>1.0.0.2</String>
</Property>
<Property Name="Creator">
<String />
Expand Down Expand Up @@ -192,6 +192,9 @@
<Property Name="Password">
<String />
</Property>
<Property Name="Chassis ID Type">
<I32>1</I32>
</Property>
</Properties>
<Errors />
<Section Name="Modules" TypeGUID="96319964-d29d-4af0-9c60-b1a785679b5f">
Expand All @@ -216,7 +219,7 @@
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Linux_x64\SLSC Switch Engine Linux64.llb\RT Driver VI.vi">
<Version>1.0.0</Version>
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\VeriStand\Custom Devices\SLSC Switch\SLSC Switch Engine Linux64.llb\RT Driver VI.vi</RTDestination>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\SLSC Switch Engine Linux64.llb\RT Driver VI.vi</RTDestination>
<SupportedTarget>Linux_x64</SupportedTarget>
<MD5 />
</DependentFile>
Expand All @@ -225,7 +228,7 @@
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Linux_32_ARM\SLSC Switch Engine LinuxARM.llb\RT Driver VI.vi">
<Version>1.0.0</Version>
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\VeriStand\Custom Devices\SLSC Switch\SLSC Switch Engine LinuxARM.llb\RT Driver VI.vi</RTDestination>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\SLSC Switch Engine LinuxARM.llb\RT Driver VI.vi</RTDestination>
<SupportedTarget>Linux_32_ARM</SupportedTarget>
<MD5 />
</DependentFile>
Expand All @@ -234,7 +237,7 @@
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\PharLap\SLSC Switch Engine Pharlap.llb\RT Driver VI.vi">
<Version>1.0.0</Version>
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\VeriStand\Custom Devices\SLSC Switch\SLSC Switch Engine Pharlap.llb\RT Driver VI.vi</RTDestination>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\SLSC Switch Engine Pharlap.llb\RT Driver VI.vi</RTDestination>
<SupportedTarget>PharLap</SupportedTarget>
<MD5 />
</DependentFile>
Expand All @@ -243,14 +246,68 @@
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Windows\SLSC Switch Engine Windows.llb\RT Driver VI.vi">
<Version>1.0.0</Version>
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\VeriStand\Custom Devices\SLSC Switch\SLSC Switch Engine Windows.llb\RT Driver VI.vi</RTDestination>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\SLSC Switch Engine Windows.llb\RT Driver VI.vi</RTDestination>
<SupportedTarget>Windows</SupportedTarget>
<MD5 />
</DependentFile>
</Property>
<Property Name="Version">
<String>1.0.0</String>
</Property>
<Property Name="Dependency_1">
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Pharlap\CDMessaging.lvlibp">
<Version />
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\CDMessaging.lvlibp</RTDestination>
<SupportedTarget>PharLap</SupportedTarget>
<MD5>2958bc2f6356144efa7826238d93c96b</MD5>
</DependentFile>
</Property>
<Property Name="Dependency_2">
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Pharlap\SLSCSwitchMessaging.lvlibp">
<Version />
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\SLSCSwitchMessaging.lvlibp</RTDestination>
<SupportedTarget>PharLap</SupportedTarget>
<MD5>381532697f5ea1783a4812f206c70055</MD5>
</DependentFile>
</Property>
<Property Name="Dependency_3">
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Linux_32_ARM\CDMessaging.lvlibp">
<Version />
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\CDMessaging.lvlibp</RTDestination>
<SupportedTarget>Linux_32_ARM</SupportedTarget>
<MD5>95e63cc839fdf5ce920aecae7bbf7da6</MD5>
</DependentFile>
</Property>
<Property Name="Dependency_4">
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Linux_32_ARM\SLSCSwitchMessaging.lvlibp">
<Version />
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\SLSCSwitchMessaging.lvlibp</RTDestination>
<SupportedTarget>Linux_32_ARM</SupportedTarget>
<MD5>a09c1facc5a8847f9aad31b51344418f</MD5>
</DependentFile>
</Property>
<Property Name="Dependency_5">
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Linux_x64\CDMessaging.lvlibp">
<Version />
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\CDMessaging.lvlibp</RTDestination>
<SupportedTarget>Linux_x64</SupportedTarget>
<MD5>ce6baf8c111ceeefddc1aa5ac5591f28</MD5>
</DependentFile>
</Property>
<Property Name="Dependency_6">
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Linux_x64\SLSCSwitchMessaging.lvlibp">
<Version />
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\SLSCSwitchMessaging.lvlibp</RTDestination>
<SupportedTarget>Linux_x64</SupportedTarget>
<MD5>dc89702f1db2635991ebbaa6bafad814</MD5>
</DependentFile>
</Property>
<Property Name="user.CD.Routing and Faulting.API Version">
<U32>1</U32>
</Property>
Expand Down
66 changes: 60 additions & 6 deletions Source/Routing and Faulting/Tests/System/Assets/Switch_and_RaF.nivssdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<String>Switch_and_RaF</String>
</Property>
<Property Name="Version">
<String>1.0.0.9</String>
<String>1.0.0.10</String>
</Property>
<Property Name="Creator">
<String />
Expand Down Expand Up @@ -55,7 +55,7 @@
<Boolean>false</Boolean>
</Property>
<Property Name="Engine Rate">
<Double>101</Double>
<Double>100</Double>
</Property>
<Property Name="TL timeout">
<Double>120</Double>
Expand Down Expand Up @@ -222,7 +222,7 @@
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Linux_x64\SLSC Switch Engine Linux64.llb\RT Driver VI.vi">
<Version>1.0.0</Version>
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\VeriStand\Custom Devices\SLSC Switch\SLSC Switch Engine Linux64.llb\RT Driver VI.vi</RTDestination>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\SLSC Switch Engine Linux64.llb\RT Driver VI.vi</RTDestination>
<SupportedTarget>Linux_x64</SupportedTarget>
<MD5 />
</DependentFile>
Expand All @@ -231,7 +231,7 @@
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Linux_32_ARM\SLSC Switch Engine LinuxARM.llb\RT Driver VI.vi">
<Version>1.0.0</Version>
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\VeriStand\Custom Devices\SLSC Switch\SLSC Switch Engine LinuxARM.llb\RT Driver VI.vi</RTDestination>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\SLSC Switch Engine LinuxARM.llb\RT Driver VI.vi</RTDestination>
<SupportedTarget>Linux_32_ARM</SupportedTarget>
<MD5 />
</DependentFile>
Expand All @@ -240,7 +240,7 @@
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\PharLap\SLSC Switch Engine Pharlap.llb\RT Driver VI.vi">
<Version>1.0.0</Version>
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\VeriStand\Custom Devices\SLSC Switch\SLSC Switch Engine Pharlap.llb\RT Driver VI.vi</RTDestination>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\SLSC Switch Engine Pharlap.llb\RT Driver VI.vi</RTDestination>
<SupportedTarget>PharLap</SupportedTarget>
<MD5 />
</DependentFile>
Expand All @@ -249,14 +249,68 @@
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Windows\SLSC Switch Engine Windows.llb\RT Driver VI.vi">
<Version>1.0.0</Version>
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\VeriStand\Custom Devices\SLSC Switch\SLSC Switch Engine Windows.llb\RT Driver VI.vi</RTDestination>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\SLSC Switch Engine Windows.llb\RT Driver VI.vi</RTDestination>
<SupportedTarget>Windows</SupportedTarget>
<MD5 />
</DependentFile>
</Property>
<Property Name="Version">
<String>1.0.0</String>
</Property>
<Property Name="Dependency_1">
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Pharlap\CDMessaging.lvlibp">
<Version />
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\CDMessaging.lvlibp</RTDestination>
<SupportedTarget>PharLap</SupportedTarget>
<MD5>2958bc2f6356144efa7826238d93c96b</MD5>
</DependentFile>
</Property>
<Property Name="Dependency_2">
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Pharlap\SLSCSwitchMessaging.lvlibp">
<Version />
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\SLSCSwitchMessaging.lvlibp</RTDestination>
<SupportedTarget>PharLap</SupportedTarget>
<MD5>381532697f5ea1783a4812f206c70055</MD5>
</DependentFile>
</Property>
<Property Name="Dependency_3">
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Linux_32_ARM\CDMessaging.lvlibp">
<Version />
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\CDMessaging.lvlibp</RTDestination>
<SupportedTarget>Linux_32_ARM</SupportedTarget>
<MD5>95e63cc839fdf5ce920aecae7bbf7da6</MD5>
</DependentFile>
</Property>
<Property Name="Dependency_4">
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Linux_32_ARM\SLSCSwitchMessaging.lvlibp">
<Version />
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\SLSCSwitchMessaging.lvlibp</RTDestination>
<SupportedTarget>Linux_32_ARM</SupportedTarget>
<MD5>a09c1facc5a8847f9aad31b51344418f</MD5>
</DependentFile>
</Property>
<Property Name="Dependency_5">
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Linux_x64\CDMessaging.lvlibp">
<Version />
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\CDMessaging.lvlibp</RTDestination>
<SupportedTarget>Linux_x64</SupportedTarget>
<MD5>ce6baf8c111ceeefddc1aa5ac5591f28</MD5>
</DependentFile>
</Property>
<Property Name="Dependency_6">
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Linux_x64\SLSCSwitchMessaging.lvlibp">
<Version />
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\SLSCSwitchMessaging.lvlibp</RTDestination>
<SupportedTarget>Linux_x64</SupportedTarget>
<MD5>dc89702f1db2635991ebbaa6bafad814</MD5>
</DependentFile>
</Property>
<Property Name="user.CD.Routing and Faulting.API Version">
<U32>1</U32>
</Property>
Expand Down
66 changes: 60 additions & 6 deletions Source/Routing and Faulting/Tests/System/Assets/Switch_and_RaF_Initial_States.nivssdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<String>Switch_and_RaF_Initial_States</String>
</Property>
<Property Name="Version">
<String>1.0.0.9</String>
<String>1.0.0.10</String>
</Property>
<Property Name="Creator">
<String />
Expand Down Expand Up @@ -55,7 +55,7 @@
<Boolean>false</Boolean>
</Property>
<Property Name="Engine Rate">
<Double>101</Double>
<Double>100</Double>
</Property>
<Property Name="TL timeout">
<Double>120</Double>
Expand Down Expand Up @@ -222,7 +222,7 @@
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Linux_x64\SLSC Switch Engine Linux64.llb\RT Driver VI.vi">
<Version>1.0.0</Version>
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\VeriStand\Custom Devices\SLSC Switch\SLSC Switch Engine Linux64.llb\RT Driver VI.vi</RTDestination>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\SLSC Switch Engine Linux64.llb\RT Driver VI.vi</RTDestination>
<SupportedTarget>Linux_x64</SupportedTarget>
<MD5 />
</DependentFile>
Expand All @@ -231,7 +231,7 @@
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Linux_32_ARM\SLSC Switch Engine LinuxARM.llb\RT Driver VI.vi">
<Version>1.0.0</Version>
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\VeriStand\Custom Devices\SLSC Switch\SLSC Switch Engine LinuxARM.llb\RT Driver VI.vi</RTDestination>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\SLSC Switch Engine LinuxARM.llb\RT Driver VI.vi</RTDestination>
<SupportedTarget>Linux_32_ARM</SupportedTarget>
<MD5 />
</DependentFile>
Expand All @@ -240,7 +240,7 @@
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\PharLap\SLSC Switch Engine Pharlap.llb\RT Driver VI.vi">
<Version>1.0.0</Version>
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\VeriStand\Custom Devices\SLSC Switch\SLSC Switch Engine Pharlap.llb\RT Driver VI.vi</RTDestination>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\SLSC Switch Engine Pharlap.llb\RT Driver VI.vi</RTDestination>
<SupportedTarget>PharLap</SupportedTarget>
<MD5 />
</DependentFile>
Expand All @@ -249,14 +249,68 @@
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Windows\SLSC Switch Engine Windows.llb\RT Driver VI.vi">
<Version>1.0.0</Version>
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\VeriStand\Custom Devices\SLSC Switch\SLSC Switch Engine Windows.llb\RT Driver VI.vi</RTDestination>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\SLSC Switch Engine Windows.llb\RT Driver VI.vi</RTDestination>
<SupportedTarget>Windows</SupportedTarget>
<MD5 />
</DependentFile>
</Property>
<Property Name="Version">
<String>1.0.0</String>
</Property>
<Property Name="Dependency_1">
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Pharlap\CDMessaging.lvlibp">
<Version />
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\CDMessaging.lvlibp</RTDestination>
<SupportedTarget>PharLap</SupportedTarget>
<MD5>2958bc2f6356144efa7826238d93c96b</MD5>
</DependentFile>
</Property>
<Property Name="Dependency_2">
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Pharlap\SLSCSwitchMessaging.lvlibp">
<Version />
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\SLSCSwitchMessaging.lvlibp</RTDestination>
<SupportedTarget>PharLap</SupportedTarget>
<MD5>381532697f5ea1783a4812f206c70055</MD5>
</DependentFile>
</Property>
<Property Name="Dependency_3">
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Linux_32_ARM\CDMessaging.lvlibp">
<Version />
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\CDMessaging.lvlibp</RTDestination>
<SupportedTarget>Linux_32_ARM</SupportedTarget>
<MD5>95e63cc839fdf5ce920aecae7bbf7da6</MD5>
</DependentFile>
</Property>
<Property Name="Dependency_4">
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Linux_32_ARM\SLSCSwitchMessaging.lvlibp">
<Version />
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\SLSCSwitchMessaging.lvlibp</RTDestination>
<SupportedTarget>Linux_32_ARM</SupportedTarget>
<MD5>a09c1facc5a8847f9aad31b51344418f</MD5>
</DependentFile>
</Property>
<Property Name="Dependency_5">
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Linux_x64\CDMessaging.lvlibp">
<Version />
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\CDMessaging.lvlibp</RTDestination>
<SupportedTarget>Linux_x64</SupportedTarget>
<MD5>ce6baf8c111ceeefddc1aa5ac5591f28</MD5>
</DependentFile>
</Property>
<Property Name="Dependency_6">
<DependentFile Type="To Common Doc Dir" Path="SLSC Plugins\Modules\SLSC Switch\Linux_x64\SLSCSwitchMessaging.lvlibp">
<Version />
<ForceDownload>false</ForceDownload>
<RTDestination>c:\ni-rt\NIVeriStand\SLSC Plugins\Modules\SLSC Switch\SLSCSwitchMessaging.lvlibp</RTDestination>
<SupportedTarget>Linux_x64</SupportedTarget>
<MD5>dc89702f1db2635991ebbaa6bafad814</MD5>
</DependentFile>
</Property>
<Property Name="user.CD.Routing and Faulting.API Version">
<U32>1</U32>
</Property>
Expand Down
Loading

0 comments on commit 429389e

Please sign in to comment.