Skip to content

Commit 1b98a3d

Browse files
francois-normandinfrancois-normandin
committed
Merge branch 'develop' into release/1.4.0
2 parents 4fe682b + fb3576c commit 1b98a3d

File tree

14 files changed

+97
-13
lines changed

14 files changed

+97
-13
lines changed

‎src/SMO/Private/StopProcesses.vi‎

-36 Bytes
Binary file not shown.

‎src/SMO/Protected/WaitOnProcessSync.vi‎

1.68 KB
Binary file not shown.

‎src/SMO/SMO.lvclass‎

Lines changed: 22 additions & 13 deletions
Large diffs are not rendered by default.

‎src/SMO/Start.vi‎

16 Bytes
Binary file not shown.

‎src/SMO/WaitForState.vi‎

34.3 KB
Binary file not shown.

‎tests/SMO_Test.lvproj‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
<Item Name="SMO.ErrorInjection" Type="Folder">
3636
<Item Name="SMO.ErrorInjection.lvclass" Type="LVClass" URL="../_test-support-SMOs/SMO.ErrorInjection/SMO.ErrorInjection.lvclass"/>
3737
</Item>
38+
<Item Name="SMO.DynamicLauncher" Type="Folder">
39+
<Item Name="SMO.DynamicLauncher.lvclass" Type="LVClass" URL="../_test-support-SMOs/SMO.DynamicLauncher/SMO.DynamicLauncher.lvclass"/>
40+
</Item>
3841
<Item Name="SMO.A.lvclass" Type="LVClass" URL="../_test-support-SMOs/SMO.A/SMO.A.lvclass"/>
3942
</Item>
4043
<Item Name="Test Cases" Type="Folder">
@@ -56,6 +59,7 @@
5659
<Item Name="large-object-count-parallel-test.vi" Type="VI" URL="../_test-cases/large-object-count-parallel-test.vi"/>
5760
<Item Name="dependency-listorder-test.vi" Type="VI" URL="../_test-cases/dependency-listorder-test.vi"/>
5861
<Item Name="aggregation-lifetime-management.vi" Type="VI" URL="../_test-cases/aggregation-lifetime-management.vi"/>
62+
<Item Name="dynamic-dependency-stop-test.vi" Type="VI" URL="../_test-cases/dynamic-dependency-stop-test.vi"/>
5963
<Item Name="attributes-test.vi" Type="VI" URL="../_test-cases/attributes-test.vi"/>
6064
<Item Name="attributes-identity-test.vi" Type="VI" URL="../_test-cases/attributes-identity-test.vi"/>
6165
<Item Name="attributes-owner-test.vi" Type="VI" URL="../_test-cases/attributes-owner-test.vi"/>
@@ -64,6 +68,7 @@
6468
<Item Name="Testable Interface" Type="Folder"/>
6569
<Item Name="SMO_Test.vipc" Type="Document" URL="../SMO_Test.vipc"/>
6670
<Item Name="Run Test Suite.vi" Type="VI" URL="../_test-cases/Run Test Suite.vi"/>
71+
<Item Name="process-sync-start-test.vi" Type="VI" URL="../_test-cases/process-sync-start-test.vi"/>
6772
<Item Name="Dependencies" Type="Dependencies">
6873
<Item Name="vi.lib" Type="Folder">
6974
<Item Name="Clear Errors.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Clear Errors.vi"/>
@@ -436,6 +441,13 @@
436441
<Item Name="NI_LVConfig.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/config.llb/NI_LVConfig.lvlib"/>
437442
<Item Name="8.6CompatibleGlobalVar.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/config.llb/8.6CompatibleGlobalVar.vi"/>
438443
<Item Name="Space Constant.vi" Type="VI" URL="/&lt;vilib&gt;/dlg_ctls.llb/Space Constant.vi"/>
444+
<Item Name="Compare Two Paths.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/libraryn.llb/Compare Two Paths.vi"/>
445+
<Item Name="3494A183FEBB6A11205EA059762AB79BStrip Path - Traditional__ogtk.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/_Caraya_internal_deps/3494A183FEBB6A11205EA059762AB79BStrip Path - Traditional__ogtk.vi"/>
446+
<Item Name="3494A183FEBB6A11205EA059762AB79BStrip Path - Arrays__ogtk.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/_Caraya_internal_deps/3494A183FEBB6A11205EA059762AB79BStrip Path - Arrays__ogtk.vi"/>
447+
<Item Name="3494A183FEBB6A11205EA059762AB79BStrip Path__ogtk.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/_Caraya_internal_deps/3494A183FEBB6A11205EA059762AB79BStrip Path__ogtk.vi"/>
448+
<Item Name="3494A183FEBB6A11205EA059762AB79BValid Path - Traditional__ogtk.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/_Caraya_internal_deps/3494A183FEBB6A11205EA059762AB79BValid Path - Traditional__ogtk.vi"/>
449+
<Item Name="3494A183FEBB6A11205EA059762AB79BValid Path - Array__ogtk.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/_Caraya_internal_deps/3494A183FEBB6A11205EA059762AB79BValid Path - Array__ogtk.vi"/>
450+
<Item Name="3494A183FEBB6A11205EA059762AB79BValid Path__ogtk.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/_Caraya_internal_deps/3494A183FEBB6A11205EA059762AB79BValid Path__ogtk.vi"/>
439451
</Item>
440452
<Item Name="SMO.lvclass" Type="LVClass" URL="../../src/SMO/SMO.lvclass"/>
441453
<Item Name="Registry-SMO.lvclass" Type="LVClass" URL="../../src/Registry/Registry-SMO.lvclass"/>
@@ -450,6 +462,7 @@
450462
<Item Name="Attribute.StartupBehavior.lvclass" Type="LVClass" URL="../../src/Support/Attribute.StartupBehavior/Attribute.StartupBehavior.lvclass"/>
451463
<Item Name="Dependency.lvclass" Type="LVClass" URL="../../src/Dependency/Dependency.lvclass"/>
452464
<Item Name="Attribute.ErrorHandling.lvclass" Type="LVClass" URL="../../src/Support/Attribute.ErrorHandling/Attribute.ErrorHandling.lvclass"/>
465+
<Item Name="TRef FinderCallback.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/traverseref.llb/TRef FinderCallback.vi"/>
453466
</Item>
454467
<Item Name="Build Specifications" Type="Build"/>
455468
</Item>

‎tests/_test-cases/Run Test Suite.vi‎

868 Bytes
Binary file not shown.

‎tests/_test-cases/dynamic-dependency-stop-test.vi‎

15.7 KB
Binary file not shown.

‎tests/_test-cases/process-sync-start-test.vi‎

15.6 KB
Binary file not shown.

‎tests/_test-support-SMOs/SMO.DynamicLauncher/Process.vi‎

65.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)