Jump to content

Diff Teststand: Difference between revisions

From LabVIEW Wiki
Bryan (talk | contribs)
Added TortoiseSVN diff settings for TestStand 2014 & 2016 - These may work with other versions but I don't have them to verify.
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.
 
(One intermediate revision by one other user not shown)
Line 4: Line 4:
<pre>"C:\Program Files\National Instruments\TestStand 4.2\Bin\SequenceFileDiffer.exe"&nbsp;%base&nbsp;%mine</pre>  
<pre>"C:\Program Files\National Instruments\TestStand 4.2\Bin\SequenceFileDiffer.exe"&nbsp;%base&nbsp;%mine</pre>  


For later versions<ref>Verified with 32-bit versions of TestStand 2014 and 2016.</ref> of (32-bit) TestStand, the following settings can be used for [[TortoiseSVN client to Subversion|TortoiseSVN]]:
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>
<pre>"C:\Program Files (x86)\National Instruments\shared\TestStand\FileDifferLauncher.exe" %base %mine</pre>


Line 10: Line 10:


[[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.