From 3db1926739b18d79248fef0815256afef43fb84e Mon Sep 17 00:00:00 2001
From: Jay Fitzgerald <34140133+ni-jfitzger@users.noreply.github.com>
Date: Sun, 21 Apr 2024 15:02:48 -0500
Subject: [PATCH 1/2] Eliminate unused kibana json

---
 .github/actions/linux/action.yml          | 1 -
 .github/actions/windows/action.yml        | 1 -
 build/templates/tox-system_tests.ini.mako | 4 ++--
 generated/nidcpower/tox-system_tests.ini  | 4 ++--
 generated/nidigital/tox-system_tests.ini  | 4 ++--
 generated/nidmm/tox-system_tests.ini      | 4 ++--
 generated/nifake/tox-system_tests.ini     | 4 ++--
 generated/nifgen/tox-system_tests.ini     | 4 ++--
 generated/nimodinst/tox-system_tests.ini  | 4 ++--
 generated/niscope/tox-system_tests.ini    | 4 ++--
 generated/nise/tox-system_tests.ini       | 4 ++--
 generated/niswitch/tox-system_tests.ini   | 4 ++--
 generated/nitclk/tox-system_tests.ini     | 4 ++--
 13 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/.github/actions/linux/action.yml b/.github/actions/linux/action.yml
index 5a9527bec..1a18a798f 100644
--- a/.github/actions/linux/action.yml
+++ b/.github/actions/linux/action.yml
@@ -13,7 +13,6 @@ runs:
         source /etc/bashrc
         cd generated
         mkdir junit
-        mkdir kibana
         cd ${{ inputs.module_name }}
         python -m tox -c tox-system_tests.ini
       shell: bash
\ No newline at end of file
diff --git a/.github/actions/windows/action.yml b/.github/actions/windows/action.yml
index 796803d02..22703db7d 100644
--- a/.github/actions/windows/action.yml
+++ b/.github/actions/windows/action.yml
@@ -12,7 +12,6 @@ runs:
     - run: |
         cd generated        
         mkdir junit
-        mkdir kibana
         cd ${{ inputs.module_name }}
         python -m tox -c tox-system_tests.ini
       shell: powershell
\ No newline at end of file
diff --git a/build/templates/tox-system_tests.ini.mako b/build/templates/tox-system_tests.ini.mako
index a8c6d982c..1cf9026d4 100644
--- a/build/templates/tox-system_tests.ini.mako
+++ b/build/templates/tox-system_tests.ini.mako
@@ -58,8 +58,8 @@ commands =
     ${module_name}-system_tests: python ../../tools/install_local_wheel.py --driver ${other_wheel} --start-path ../..
 % endif
     ${module_name}-system_tests: python -c "import ${module_name}; ${module_name}.print_diagnostic_information()"
-    ${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}-{env:BITNESS:64}.xml --json=../kibana/${module_name}_system_test_result.json {posargs}
-    ${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 --json=../kibana/${module_name}_system_test_result.json --durations=5 {posargs}
+    ${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}-{env:BITNESS:64}.xml {posargs}
+    ${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}
 
     ${module_name}-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
diff --git a/generated/nidcpower/tox-system_tests.ini b/generated/nidcpower/tox-system_tests.ini
index f3d978c88..e4c3943ba 100644
--- a/generated/nidcpower/tox-system_tests.ini
+++ b/generated/nidcpower/tox-system_tests.ini
@@ -22,8 +22,8 @@ commands =
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nidcpower-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nidcpower-system_tests: python -c "import nidcpower; nidcpower.print_diagnostic_information()"
-    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}-{env:BITNESS:64}.xml --json=../kibana/nidcpower_system_test_result.json {posargs}
-    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 --json=../kibana/nidcpower_system_test_result.json --durations=5 {posargs}
+    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}-{env:BITNESS:64}.xml {posargs}
+    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}
 
     nidcpower-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
diff --git a/generated/nidigital/tox-system_tests.ini b/generated/nidigital/tox-system_tests.ini
index f8554413d..5af75f394 100644
--- a/generated/nidigital/tox-system_tests.ini
+++ b/generated/nidigital/tox-system_tests.ini
@@ -27,8 +27,8 @@ commands =
     nidigital-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nidigital-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../..
     nidigital-system_tests: python -c "import nidigital; nidigital.print_diagnostic_information()"
-    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}-{env:BITNESS:64}.xml --json=../kibana/nidigital_system_test_result.json {posargs}
-    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 --json=../kibana/nidigital_system_test_result.json --durations=5 {posargs}
+    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}-{env:BITNESS:64}.xml {posargs}
+    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}
 
     nidigital-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
diff --git a/generated/nidmm/tox-system_tests.ini b/generated/nidmm/tox-system_tests.ini
index 4afa4b07f..46b25ff2e 100644
--- a/generated/nidmm/tox-system_tests.ini
+++ b/generated/nidmm/tox-system_tests.ini
@@ -22,8 +22,8 @@ commands =
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nidmm-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nidmm-system_tests: python -c "import nidmm; nidmm.print_diagnostic_information()"
-    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}-{env:BITNESS:64}.xml --json=../kibana/nidmm_system_test_result.json {posargs}
-    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 --json=../kibana/nidmm_system_test_result.json --durations=5 {posargs}
+    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}-{env:BITNESS:64}.xml {posargs}
+    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}
 
     nidmm-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
diff --git a/generated/nifake/tox-system_tests.ini b/generated/nifake/tox-system_tests.ini
index db87c740f..6d5dbe3e3 100644
--- a/generated/nifake/tox-system_tests.ini
+++ b/generated/nifake/tox-system_tests.ini
@@ -27,8 +27,8 @@ commands =
     nifake-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nifake-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../..
     nifake-system_tests: python -c "import nifake; nifake.print_diagnostic_information()"
-    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}-{env:BITNESS:64}.xml --json=../kibana/nifake_system_test_result.json {posargs}
-    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 --json=../kibana/nifake_system_test_result.json --durations=5 {posargs}
+    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}-{env:BITNESS:64}.xml {posargs}
+    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}
 
     nifake-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
diff --git a/generated/nifgen/tox-system_tests.ini b/generated/nifgen/tox-system_tests.ini
index 23b968fe6..c2b3f578c 100644
--- a/generated/nifgen/tox-system_tests.ini
+++ b/generated/nifgen/tox-system_tests.ini
@@ -27,8 +27,8 @@ commands =
     nifgen-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nifgen-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../..
     nifgen-system_tests: python -c "import nifgen; nifgen.print_diagnostic_information()"
-    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}-{env:BITNESS:64}.xml --json=../kibana/nifgen_system_test_result.json {posargs}
-    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 --json=../kibana/nifgen_system_test_result.json --durations=5 {posargs}
+    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}-{env:BITNESS:64}.xml {posargs}
+    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}
 
     nifgen-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
diff --git a/generated/nimodinst/tox-system_tests.ini b/generated/nimodinst/tox-system_tests.ini
index d2ea1c0bf..90dd67ad7 100644
--- a/generated/nimodinst/tox-system_tests.ini
+++ b/generated/nimodinst/tox-system_tests.ini
@@ -22,8 +22,8 @@ commands =
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nimodinst-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nimodinst-system_tests: python -c "import nimodinst; nimodinst.print_diagnostic_information()"
-    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}-{env:BITNESS:64}.xml --json=../kibana/nimodinst_system_test_result.json {posargs}
-    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 --json=../kibana/nimodinst_system_test_result.json --durations=5 {posargs}
+    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}-{env:BITNESS:64}.xml {posargs}
+    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}
 
     nimodinst-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
diff --git a/generated/niscope/tox-system_tests.ini b/generated/niscope/tox-system_tests.ini
index 8fb6dec9b..abb6cc0a6 100644
--- a/generated/niscope/tox-system_tests.ini
+++ b/generated/niscope/tox-system_tests.ini
@@ -27,8 +27,8 @@ commands =
     niscope-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     niscope-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../..
     niscope-system_tests: python -c "import niscope; niscope.print_diagnostic_information()"
-    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}-{env:BITNESS:64}.xml --json=../kibana/niscope_system_test_result.json {posargs}
-    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 --json=../kibana/niscope_system_test_result.json --durations=5 {posargs}
+    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}-{env:BITNESS:64}.xml {posargs}
+    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}
 
     niscope-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
diff --git a/generated/nise/tox-system_tests.ini b/generated/nise/tox-system_tests.ini
index 1a7f41eaf..a4c989730 100644
--- a/generated/nise/tox-system_tests.ini
+++ b/generated/nise/tox-system_tests.ini
@@ -22,8 +22,8 @@ commands =
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nise-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nise-system_tests: python -c "import nise; nise.print_diagnostic_information()"
-    nise-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nise --parallel-mode -m pytest ../../src/nise/examples --junitxml=../junit/junit-nise-{envname}-{env:BITNESS:64}.xml --json=../kibana/nise_system_test_result.json {posargs}
-    nise-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nise --parallel-mode -m pytest ../../src/nise/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nise-{envname}-{env:BITNESS:64}.xml --json=../kibana/nise_system_test_result.json --durations=5 {posargs}
+    nise-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nise --parallel-mode -m pytest ../../src/nise/examples --junitxml=../junit/junit-nise-{envname}-{env:BITNESS:64}.xml {posargs}
+    nise-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nise --parallel-mode -m pytest ../../src/nise/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nise-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs}
 
     nise-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
diff --git a/generated/niswitch/tox-system_tests.ini b/generated/niswitch/tox-system_tests.ini
index 474e15b66..e3515f259 100644
--- a/generated/niswitch/tox-system_tests.ini
+++ b/generated/niswitch/tox-system_tests.ini
@@ -22,8 +22,8 @@ commands =
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     niswitch-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     niswitch-system_tests: python -c "import niswitch; niswitch.print_diagnostic_information()"
-    niswitch-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source niswitch --parallel-mode -m pytest ../../src/niswitch/examples --junitxml=../junit/junit-niswitch-{envname}-{env:BITNESS:64}.xml --json=../kibana/niswitch_system_test_result.json {posargs}
-    niswitch-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source niswitch --parallel-mode -m pytest ../../src/niswitch/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-niswitch-{envname}-{env:BITNESS:64}.xml --json=../kibana/niswitch_system_test_result.json --durations=5 {posargs}
+    niswitch-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source niswitch --parallel-mode -m pytest ../../src/niswitch/examples --junitxml=../junit/junit-niswitch-{envname}-{env:BITNESS:64}.xml {posargs}
+    niswitch-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source niswitch --parallel-mode -m pytest ../../src/niswitch/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-niswitch-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs}
 
     niswitch-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
diff --git a/generated/nitclk/tox-system_tests.ini b/generated/nitclk/tox-system_tests.ini
index ac2704f5b..0683279c4 100644
--- a/generated/nitclk/tox-system_tests.ini
+++ b/generated/nitclk/tox-system_tests.ini
@@ -27,8 +27,8 @@ commands =
     nitclk-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nitclk-system_tests: python ../../tools/install_local_wheel.py --driver niscope --start-path ../..
     nitclk-system_tests: python -c "import nitclk; nitclk.print_diagnostic_information()"
-    nitclk-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nitclk --parallel-mode -m pytest ../../src/nitclk/examples --junitxml=../junit/junit-nitclk-{envname}-{env:BITNESS:64}.xml --json=../kibana/nitclk_system_test_result.json {posargs}
-    nitclk-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nitclk --parallel-mode -m pytest ../../src/nitclk/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nitclk-{envname}-{env:BITNESS:64}.xml --json=../kibana/nitclk_system_test_result.json --durations=5 {posargs}
+    nitclk-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nitclk --parallel-mode -m pytest ../../src/nitclk/examples --junitxml=../junit/junit-nitclk-{envname}-{env:BITNESS:64}.xml {posargs}
+    nitclk-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nitclk --parallel-mode -m pytest ../../src/nitclk/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nitclk-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs}
 
     nitclk-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload

From 1c3613fc537cb75e8fa8d1e75d6e48fe679bcb72 Mon Sep 17 00:00:00 2001
From: Jay Fitzgerald <34140133+ni-jfitzger@users.noreply.github.com>
Date: Sun, 21 Apr 2024 15:49:28 -0500
Subject: [PATCH 2/2] Do not overwrite example tests junitxml

---
 build/templates/tox-system_tests.ini.mako | 2 +-
 generated/nidcpower/tox-system_tests.ini  | 2 +-
 generated/nidigital/tox-system_tests.ini  | 2 +-
 generated/nidmm/tox-system_tests.ini      | 2 +-
 generated/nifake/tox-system_tests.ini     | 2 +-
 generated/nifgen/tox-system_tests.ini     | 2 +-
 generated/nimodinst/tox-system_tests.ini  | 2 +-
 generated/niscope/tox-system_tests.ini    | 2 +-
 generated/nise/tox-system_tests.ini       | 2 +-
 generated/niswitch/tox-system_tests.ini   | 2 +-
 generated/nitclk/tox-system_tests.ini     | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build/templates/tox-system_tests.ini.mako b/build/templates/tox-system_tests.ini.mako
index 1cf9026d4..8a08c0c03 100644
--- a/build/templates/tox-system_tests.ini.mako
+++ b/build/templates/tox-system_tests.ini.mako
@@ -58,7 +58,7 @@ commands =
     ${module_name}-system_tests: python ../../tools/install_local_wheel.py --driver ${other_wheel} --start-path ../..
 % endif
     ${module_name}-system_tests: python -c "import ${module_name}; ${module_name}.print_diagnostic_information()"
-    ${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}-{env:BITNESS:64}.xml {posargs}
+    ${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}
     ${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}
 
     ${module_name}-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
diff --git a/generated/nidcpower/tox-system_tests.ini b/generated/nidcpower/tox-system_tests.ini
index e4c3943ba..730674bfe 100644
--- a/generated/nidcpower/tox-system_tests.ini
+++ b/generated/nidcpower/tox-system_tests.ini
@@ -22,7 +22,7 @@ commands =
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nidcpower-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nidcpower-system_tests: python -c "import nidcpower; nidcpower.print_diagnostic_information()"
-    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}-{env:BITNESS:64}.xml {posargs}
+    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}
     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}
 
     nidcpower-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
diff --git a/generated/nidigital/tox-system_tests.ini b/generated/nidigital/tox-system_tests.ini
index 5af75f394..1858755fc 100644
--- a/generated/nidigital/tox-system_tests.ini
+++ b/generated/nidigital/tox-system_tests.ini
@@ -27,7 +27,7 @@ commands =
     nidigital-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nidigital-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../..
     nidigital-system_tests: python -c "import nidigital; nidigital.print_diagnostic_information()"
-    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}-{env:BITNESS:64}.xml {posargs}
+    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}
     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}
 
     nidigital-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
diff --git a/generated/nidmm/tox-system_tests.ini b/generated/nidmm/tox-system_tests.ini
index 46b25ff2e..97ddb7978 100644
--- a/generated/nidmm/tox-system_tests.ini
+++ b/generated/nidmm/tox-system_tests.ini
@@ -22,7 +22,7 @@ commands =
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nidmm-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nidmm-system_tests: python -c "import nidmm; nidmm.print_diagnostic_information()"
-    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}-{env:BITNESS:64}.xml {posargs}
+    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}
     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}
 
     nidmm-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
diff --git a/generated/nifake/tox-system_tests.ini b/generated/nifake/tox-system_tests.ini
index 6d5dbe3e3..4e7ff16d8 100644
--- a/generated/nifake/tox-system_tests.ini
+++ b/generated/nifake/tox-system_tests.ini
@@ -27,7 +27,7 @@ commands =
     nifake-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nifake-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../..
     nifake-system_tests: python -c "import nifake; nifake.print_diagnostic_information()"
-    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}-{env:BITNESS:64}.xml {posargs}
+    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}
     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}
 
     nifake-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
diff --git a/generated/nifgen/tox-system_tests.ini b/generated/nifgen/tox-system_tests.ini
index c2b3f578c..d1c78ddc9 100644
--- a/generated/nifgen/tox-system_tests.ini
+++ b/generated/nifgen/tox-system_tests.ini
@@ -27,7 +27,7 @@ commands =
     nifgen-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nifgen-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../..
     nifgen-system_tests: python -c "import nifgen; nifgen.print_diagnostic_information()"
-    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}-{env:BITNESS:64}.xml {posargs}
+    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}
     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}
 
     nifgen-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
diff --git a/generated/nimodinst/tox-system_tests.ini b/generated/nimodinst/tox-system_tests.ini
index 90dd67ad7..62237e691 100644
--- a/generated/nimodinst/tox-system_tests.ini
+++ b/generated/nimodinst/tox-system_tests.ini
@@ -22,7 +22,7 @@ commands =
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nimodinst-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nimodinst-system_tests: python -c "import nimodinst; nimodinst.print_diagnostic_information()"
-    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}-{env:BITNESS:64}.xml {posargs}
+    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}
     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}
 
     nimodinst-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
diff --git a/generated/niscope/tox-system_tests.ini b/generated/niscope/tox-system_tests.ini
index abb6cc0a6..a144ebf3f 100644
--- a/generated/niscope/tox-system_tests.ini
+++ b/generated/niscope/tox-system_tests.ini
@@ -27,7 +27,7 @@ commands =
     niscope-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     niscope-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../..
     niscope-system_tests: python -c "import niscope; niscope.print_diagnostic_information()"
-    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}-{env:BITNESS:64}.xml {posargs}
+    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}
     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}
 
     niscope-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
diff --git a/generated/nise/tox-system_tests.ini b/generated/nise/tox-system_tests.ini
index a4c989730..a28ce63d3 100644
--- a/generated/nise/tox-system_tests.ini
+++ b/generated/nise/tox-system_tests.ini
@@ -22,7 +22,7 @@ commands =
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nise-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nise-system_tests: python -c "import nise; nise.print_diagnostic_information()"
-    nise-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nise --parallel-mode -m pytest ../../src/nise/examples --junitxml=../junit/junit-nise-{envname}-{env:BITNESS:64}.xml {posargs}
+    nise-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nise --parallel-mode -m pytest ../../src/nise/examples --junitxml=../junit/junit-nise-{envname}-examples-{env:BITNESS:64}.xml {posargs}
     nise-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nise --parallel-mode -m pytest ../../src/nise/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nise-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs}
 
     nise-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
diff --git a/generated/niswitch/tox-system_tests.ini b/generated/niswitch/tox-system_tests.ini
index e3515f259..24eb3b109 100644
--- a/generated/niswitch/tox-system_tests.ini
+++ b/generated/niswitch/tox-system_tests.ini
@@ -22,7 +22,7 @@ commands =
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     niswitch-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     niswitch-system_tests: python -c "import niswitch; niswitch.print_diagnostic_information()"
-    niswitch-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source niswitch --parallel-mode -m pytest ../../src/niswitch/examples --junitxml=../junit/junit-niswitch-{envname}-{env:BITNESS:64}.xml {posargs}
+    niswitch-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source niswitch --parallel-mode -m pytest ../../src/niswitch/examples --junitxml=../junit/junit-niswitch-{envname}-examples-{env:BITNESS:64}.xml {posargs}
     niswitch-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source niswitch --parallel-mode -m pytest ../../src/niswitch/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-niswitch-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs}
 
     niswitch-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
diff --git a/generated/nitclk/tox-system_tests.ini b/generated/nitclk/tox-system_tests.ini
index 0683279c4..5c9bfc954 100644
--- a/generated/nitclk/tox-system_tests.ini
+++ b/generated/nitclk/tox-system_tests.ini
@@ -27,7 +27,7 @@ commands =
     nitclk-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nitclk-system_tests: python ../../tools/install_local_wheel.py --driver niscope --start-path ../..
     nitclk-system_tests: python -c "import nitclk; nitclk.print_diagnostic_information()"
-    nitclk-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nitclk --parallel-mode -m pytest ../../src/nitclk/examples --junitxml=../junit/junit-nitclk-{envname}-{env:BITNESS:64}.xml {posargs}
+    nitclk-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nitclk --parallel-mode -m pytest ../../src/nitclk/examples --junitxml=../junit/junit-nitclk-{envname}-examples-{env:BITNESS:64}.xml {posargs}
     nitclk-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nitclk --parallel-mode -m pytest ../../src/nitclk/system_tests -c tox-system_tests.ini --junitxml=../junit/junit-nitclk-{envname}-{env:BITNESS:64}.xml --durations=5 {posargs}
 
     nitclk-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./