Jump to content

Diff Teststand: Difference between revisions

From LabVIEW Wiki
mNo edit summary
m I used the second entry with TestStand 2021 SP1 (64-bit) - it also worked despite the file differ launcher being in the Program Files (x86) directory.
 
(2 intermediate revisions by 2 users not shown)
Line 1: Line 1:
In order to use a [[Source Code Control Tools|SCC tool]] with [[Teststand|teststand]] sequence files, it's possible to use SeqFileDifferApp.exe deliverd by [[NI|NI]] in the &lt;Teststand&gt;\bin folder.<br>  
In order to use a [[Source Code Control Tools|SCC tool]] with [[Teststand|teststand]] sequence files, it's possible to use SeqFileDifferApp.exe deliverd by [[NI|NI]] in the &lt;Teststand&gt;\bin folder.<br>  


For [[TortoiseSVN client to Subversion|TortoiseSVN]] the following settings can be used:<br>  
For [[TortoiseSVN client to Subversion|TortoiseSVN]] the following settings can be used<ref>http://lavag.org/topic/12386-tortoisesvn-diff-with-teststand-sequences/page__view__findpost__p__74269</ref>:
<pre>"C:\Program Files\National Instruments\TestStand 4.2\Bin\SequenceFileDiffer.exe"&nbsp;%base&nbsp;%mine
<pre>"C:\Program Files\National Instruments\TestStand 4.2\Bin\SequenceFileDiffer.exe"&nbsp;%base&nbsp;%mine</pre>  
</pre>  
 
Reported by Asbo<ref>http://lavag.org/topic/12386-tortoisesvn-diff-with-teststand-sequences/page__view__findpost__p__74269</ref>  
For later versions<ref>Verified with 32-bit versions of TestStand 2014 and 2016 and 64-bit version of TestStand 2021 SP1.</ref> of TestStand, the following settings can be used for [[TortoiseSVN client to Subversion|TortoiseSVN]]:
<pre>"C:\Program Files (x86)\National Instruments\shared\TestStand\FileDifferLauncher.exe" %base %mine</pre>
 
References/Notes:


[[Category:SCC]]
[[Category:SCC]]
 
[[Category:TestStand]]
[[Category:Teststand]]

Latest revision as of 13:47, 13 February 2024

In order to use a SCC tool with teststand sequence files, it's possible to use SeqFileDifferApp.exe deliverd by NI in the <Teststand>\bin folder.

For TortoiseSVN the following settings can be used[1]:

"C:\Program Files\National Instruments\TestStand 4.2\Bin\SequenceFileDiffer.exe" %base %mine

For later versions[2] of TestStand, the following settings can be used for TortoiseSVN:

"C:\Program Files (x86)\National Instruments\shared\TestStand\FileDifferLauncher.exe" %base %mine

References/Notes:

  1. http://lavag.org/topic/12386-tortoisesvn-diff-with-teststand-sequences/page__view__findpost__p__74269
  2. Verified with 32-bit versions of TestStand 2014 and 2016 and 64-bit version of TestStand 2021 SP1.