Skip to content

Commit 4e7b77d

Browse files
rahur-NIrahur-NI
committed
Use PATH-based nisimdev
1 parent e3c209d commit 4e7b77d

12 files changed

Lines changed: 48 additions & 48 deletions

File tree

‎build/templates/tox-system_tests.ini.mako‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ commands =
6363
${module_name}-system_tests: python ../../tools/install_local_wheel.py --driver ${other_wheel} --start-path ../..
6464
% endif
6565
${module_name}-system_tests: python -c "import ${module_name}; ${module_name}.print_diagnostic_information()"
66-
${module_name}-system_tests: lsni -u -v
67-
${module_name}-system_tests: ./nisimdev create -S true -V "National Instruments" -M "NI PXI-5124" -l "PXI1" -s 2 -a "5124"
68-
${module_name}-system_tests: ./nisimdev create -S true -V "National Instruments" -M "NI PXI-5142" -l "PXI1" -s 3 -a "5142"
69-
${module_name}-system_tests: lsni -u -v
66+
${module_name}-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None"
67+
${module_name}-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5124', '-l', 'PXI1', '-s', '2', '-a', '5124'], check=False) if nisimdev else None"
68+
${module_name}-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5142', '-l', 'PXI1', '-s', '3', '-a', '5142'], check=False) if nisimdev else None"
69+
${module_name}-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None"
7070
${module_name}-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source ${module_name} --parallel-mode -m pytest ../../src/${module_name}/examples --junitxml=../junit/junit-${module_name}-{envname}-examples-{env:BITNESS:64}.xml {posargs}
7171
${module_name}-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source ${module_name} --parallel-mode -m pytest ../../src/${module_name}/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-${module_name}-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs}
7272

‎generated/nidcpower/tox-system_tests.ini‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ commands =
2525
# --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
2626
nidcpower-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
2727
nidcpower-system_tests: python -c "import nidcpower; nidcpower.print_diagnostic_information()"
28-
nidcpower-system_tests: lsni -u -v
29-
nidcpower-system_tests: ./nisimdev create -S true -V "National Instruments" -M "NI PXI-5124" -l "PXI1" -s 2 -a "5124"
30-
nidcpower-system_tests: ./nisimdev create -S true -V "National Instruments" -M "NI PXI-5142" -l "PXI1" -s 3 -a "5142"
31-
nidcpower-system_tests: lsni -u -v
28+
nidcpower-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None"
29+
nidcpower-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5124', '-l', 'PXI1', '-s', '2', '-a', '5124'], check=False) if nisimdev else None"
30+
nidcpower-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5142', '-l', 'PXI1', '-s', '3', '-a', '5142'], check=False) if nisimdev else None"
31+
nidcpower-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None"
3232
nidcpower-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidcpower --parallel-mode -m pytest ../../src/nidcpower/examples --junitxml=../junit/junit-nidcpower-{envname}-examples-{env:BITNESS:64}.xml {posargs}
3333
nidcpower-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidcpower --parallel-mode -m pytest ../../src/nidcpower/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nidcpower-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs}
3434

‎generated/nidigital/tox-system_tests.ini‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ commands =
3030
nidigital-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
3131
nidigital-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../..
3232
nidigital-system_tests: python -c "import nidigital; nidigital.print_diagnostic_information()"
33-
nidigital-system_tests: lsni -u -v
34-
nidigital-system_tests: ./nisimdev create -S true -V "National Instruments" -M "NI PXI-5124" -l "PXI1" -s 2 -a "5124"
35-
nidigital-system_tests: ./nisimdev create -S true -V "National Instruments" -M "NI PXI-5142" -l "PXI1" -s 3 -a "5142"
36-
nidigital-system_tests: lsni -u -v
33+
nidigital-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None"
34+
nidigital-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5124', '-l', 'PXI1', '-s', '2', '-a', '5124'], check=False) if nisimdev else None"
35+
nidigital-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5142', '-l', 'PXI1', '-s', '3', '-a', '5142'], check=False) if nisimdev else None"
36+
nidigital-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None"
3737
nidigital-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidigital --parallel-mode -m pytest ../../src/nidigital/examples --junitxml=../junit/junit-nidigital-{envname}-examples-{env:BITNESS:64}.xml {posargs}
3838
nidigital-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidigital --parallel-mode -m pytest ../../src/nidigital/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nidigital-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs}
3939

‎generated/nidmm/tox-system_tests.ini‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ commands =
2525
# --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
2626
nidmm-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
2727
nidmm-system_tests: python -c "import nidmm; nidmm.print_diagnostic_information()"
28-
nidmm-system_tests: lsni -u -v
29-
nidmm-system_tests: ./nisimdev create -S true -V "National Instruments" -M "NI PXI-5124" -l "PXI1" -s 2 -a "5124"
30-
nidmm-system_tests: ./nisimdev create -S true -V "National Instruments" -M "NI PXI-5142" -l "PXI1" -s 3 -a "5142"
31-
nidmm-system_tests: lsni -u -v
28+
nidmm-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None"
29+
nidmm-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5124', '-l', 'PXI1', '-s', '2', '-a', '5124'], check=False) if nisimdev else None"
30+
nidmm-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5142', '-l', 'PXI1', '-s', '3', '-a', '5142'], check=False) if nisimdev else None"
31+
nidmm-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None"
3232
nidmm-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidmm --parallel-mode -m pytest ../../src/nidmm/examples --junitxml=../junit/junit-nidmm-{envname}-examples-{env:BITNESS:64}.xml {posargs}
3333
nidmm-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidmm --parallel-mode -m pytest ../../src/nidmm/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nidmm-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs}
3434

‎generated/nifake/tox-system_tests.ini‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ commands =
3030
nifake-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
3131
nifake-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../..
3232
nifake-system_tests: python -c "import nifake; nifake.print_diagnostic_information()"
33-
nifake-system_tests: lsni -u -v
34-
nifake-system_tests: ./nisimdev create -S true -V "National Instruments" -M "NI PXI-5124" -l "PXI1" -s 2 -a "5124"
35-
nifake-system_tests: ./nisimdev create -S true -V "National Instruments" -M "NI PXI-5142" -l "PXI1" -s 3 -a "5142"
36-
nifake-system_tests: lsni -u -v
33+
nifake-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None"
34+
nifake-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5124', '-l', 'PXI1', '-s', '2', '-a', '5124'], check=False) if nisimdev else None"
35+
nifake-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5142', '-l', 'PXI1', '-s', '3', '-a', '5142'], check=False) if nisimdev else None"
36+
nifake-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None"
3737
nifake-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nifake --parallel-mode -m pytest ../../src/nifake/examples --junitxml=../junit/junit-nifake-{envname}-examples-{env:BITNESS:64}.xml {posargs}
3838
nifake-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nifake --parallel-mode -m pytest ../../src/nifake/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nifake-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs}
3939

‎generated/nifgen/tox-system_tests.ini‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ commands =
3030
nifgen-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
3131
nifgen-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../..
3232
nifgen-system_tests: python -c "import nifgen; nifgen.print_diagnostic_information()"
33-
nifgen-system_tests: lsni -u -v
34-
nifgen-system_tests: ./nisimdev create -S true -V "National Instruments" -M "NI PXI-5124" -l "PXI1" -s 2 -a "5124"
35-
nifgen-system_tests: ./nisimdev create -S true -V "National Instruments" -M "NI PXI-5142" -l "PXI1" -s 3 -a "5142"
36-
nifgen-system_tests: lsni -u -v
33+
nifgen-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None"
34+
nifgen-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5124', '-l', 'PXI1', '-s', '2', '-a', '5124'], check=False) if nisimdev else None"
35+
nifgen-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5142', '-l', 'PXI1', '-s', '3', '-a', '5142'], check=False) if nisimdev else None"
36+
nifgen-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None"
3737
nifgen-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nifgen --parallel-mode -m pytest ../../src/nifgen/examples --junitxml=../junit/junit-nifgen-{envname}-examples-{env:BITNESS:64}.xml {posargs}
3838
nifgen-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nifgen --parallel-mode -m pytest ../../src/nifgen/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nifgen-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs}
3939

‎generated/nimodinst/tox-system_tests.ini‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ commands =
2525
# --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
2626
nimodinst-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
2727
nimodinst-system_tests: python -c "import nimodinst; nimodinst.print_diagnostic_information()"
28-
nimodinst-system_tests: lsni -u -v
29-
nimodinst-system_tests: ./nisimdev create -S true -V "National Instruments" -M "NI PXI-5124" -l "PXI1" -s 2 -a "5124"
30-
nimodinst-system_tests: ./nisimdev create -S true -V "National Instruments" -M "NI PXI-5142" -l "PXI1" -s 3 -a "5142"
31-
nimodinst-system_tests: lsni -u -v
28+
nimodinst-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None"
29+
nimodinst-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5124', '-l', 'PXI1', '-s', '2', '-a', '5124'], check=False) if nisimdev else None"
30+
nimodinst-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5142', '-l', 'PXI1', '-s', '3', '-a', '5142'], check=False) if nisimdev else None"
31+
nimodinst-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None"
3232
nimodinst-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nimodinst --parallel-mode -m pytest ../../src/nimodinst/examples --junitxml=../junit/junit-nimodinst-{envname}-examples-{env:BITNESS:64}.xml {posargs}
3333
nimodinst-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nimodinst --parallel-mode -m pytest ../../src/nimodinst/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nimodinst-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs}
3434

‎generated/nirfsg/tox-system_tests.ini‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ commands =
3030
nirfsg-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
3131
nirfsg-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../..
3232
nirfsg-system_tests: python -c "import nirfsg; nirfsg.print_diagnostic_information()"
33-
nirfsg-system_tests: lsni -u -v
34-
nirfsg-system_tests: ./nisimdev create -S true -V "National Instruments" -M "NI PXI-5124" -l "PXI1" -s 2 -a "5124"
35-
nirfsg-system_tests: ./nisimdev create -S true -V "National Instruments" -M "NI PXI-5142" -l "PXI1" -s 3 -a "5142"
36-
nirfsg-system_tests: lsni -u -v
33+
nirfsg-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None"
34+
nirfsg-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5124', '-l', 'PXI1', '-s', '2', '-a', '5124'], check=False) if nisimdev else None"
35+
nirfsg-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5142', '-l', 'PXI1', '-s', '3', '-a', '5142'], check=False) if nisimdev else None"
36+
nirfsg-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None"
3737
nirfsg-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nirfsg --parallel-mode -m pytest ../../src/nirfsg/examples --junitxml=../junit/junit-nirfsg-{envname}-examples-{env:BITNESS:64}.xml {posargs}
3838
nirfsg-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nirfsg --parallel-mode -m pytest ../../src/nirfsg/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nirfsg-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs}
3939

‎generated/niscope/tox-system_tests.ini‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ commands =
3030
niscope-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
3131
niscope-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../..
3232
niscope-system_tests: python -c "import niscope; niscope.print_diagnostic_information()"
33-
niscope-system_tests: lsni -u -v
34-
niscope-system_tests: ./nisimdev create -S true -V "National Instruments" -M "NI PXI-5124" -l "PXI1" -s 2 -a "5124"
35-
niscope-system_tests: ./nisimdev create -S true -V "National Instruments" -M "NI PXI-5142" -l "PXI1" -s 3 -a "5142"
36-
niscope-system_tests: lsni -u -v
33+
niscope-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None"
34+
niscope-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5124', '-l', 'PXI1', '-s', '2', '-a', '5124'], check=False) if nisimdev else None"
35+
niscope-system_tests: python -c "import shutil, subprocess; nisimdev = shutil.which('nisimdev'); subprocess.run([nisimdev, 'create', '-S', 'true', '-V', 'National Instruments', '-M', 'NI PXI-5142', '-l', 'PXI1', '-s', '3', '-a', '5142'], check=False) if nisimdev else None"
36+
niscope-system_tests: python -c "import sys, shutil, subprocess; lsni = shutil.which('lsni'); subprocess.run([lsni, '-u', '-v'], check=False) if (sys.platform != 'win32' and lsni) else None"
3737
niscope-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source niscope --parallel-mode -m pytest ../../src/niscope/examples --junitxml=../junit/junit-niscope-{envname}-examples-{env:BITNESS:64}.xml {posargs}
3838
niscope-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source niscope --parallel-mode -m pytest ../../src/niscope/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-niscope-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs}
3939

0 commit comments

Comments
 (0)