Unit tests

.github/workflows/tests.yml

@@ -1,32 +1,104 @@
 name: Run Unit Tests
-on:
-  push:
-    branches:
-      -'arm/**'
-  pull_request:
-    branches:
-      -'arm/**'
+
+on: push
+# on:
+#   push:
+#     branches:
+#       -'arm/**'
+#   pull_request:
+#     branches:
+#       -'arm/**'
 
 jobs:
-  test_arm64:
-    if: github.repository == 'intrepidcs/python_ics'
-    name: Linux ARM64 unit tests
-    runs-on: [ self-hosted, Linux, ARM64, Hardware ]
+  # test_arm64:
+  #   if: github.repository == 'Jonas-Harrison-ICS/python_ics'
+  #   name: Linux ARM64 unit tests
+  #   runs-on: [ self-hosted, Linux, ARM64, Hardware ]
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #       with:
+  #         submodules: recursive     
+  #         fetch-depth: 0 
+  #       # needed for history/tags##
+
+  #     - name: Setup Python
+  #       run: |
+  #         python3 -m venv .venv
+  #         source .venv/bin/activate
+  #         python3 -m pip install --upgrade pip
+  #         echo "----------------------------------------------"
+  #         pip install -r requirements.txt
+  #         pwd
+  #         echo "----------------------------------------------"
+  #         python setup.py build -g
+  #         python setup.py install --force
+  #   #      pip install .
+
+  #     - name: Run unit tests
+  #       run: |
+  #         source .venv/bin/activate
+  #         sudo setcap cap_net_admin,cap_net_raw+ep $(realpath $(which python3))
+  #         python3 -m unittest discover -s tests.runner --verbose
+  #         pytest -n auto
+
+  test_macos:
+    if: github.repository == 'Jonas-Harrison-ICS/python_ics'
+    name: MAC-OS ARM64 unit tests
+    runs-on: [ self-hosted, macOS, ARM64, Hardware ]
     steps:
       - uses: actions/checkout@v4
         with:
-          submodules: recursive
-          fetch-depth: 0 # needed for history/tags
+          submodules: recursive     
+          fetch-depth: 0 
+        # needed for history/tags##
 
       - name: Setup Python
         run: |
-          python -m venv .venv
+          python3 -m venv .venv
           source .venv/bin/activate
-          python -m pip install --upgrade pip
-          pip install .
+          python3 -m pip install --upgrade pip
+          echo "----------------------------------------------"
+          pip install -r requirements.txt
+          pwd
+          echo "----------------------------------------------"
+          python setup.py build -g
+          python setup.py install --force
+    #      pip install .
 
       - name: Run unit tests
         run: |
           source .venv/bin/activate
-          sudo setcap cap_net_admin,cap_net_raw+ep $(realpath $(which python))
-          python -m unittest discover -s tests.runner --verbose
+          python3 -m unittest discover -s tests.runner --verbose
+          pytest -n auto
+
+  test_windows:
+    if: github.repository == 'Jonas-Harrison-ICS/python_ics'
+    name: Windows unit tests
+    runs-on: [ self-hosted, Windows, x64, Hardware ]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive     
+          fetch-depth: 0 
+        # needed for history/tags##
+
+      - name: Setup Python
+        run: |
+          python -m venv .venv
+          .venv\Scripts\Activate.ps1
+          Write-Output "---------------------------------------------- VIRTUAL ENV CREATED"
+          python -m pip install --upgrade pip
+          Write-Output "---------------------------------------------- PIP INSTALLED"
+          pip install -r requirements.txt
+          pwd
+          Write-Output "---------------------------------------------- INSTALLED REQUIREMENTS.TXT"
+          python setup.py build -g
+          Write-Output "---------------------------------------------- PYTHON SETUP BUILT"
+          python setup.py install --force
+          Write-Output "---------------------------------------------- PYTHON SETUP INSTALLED"
+    #      pip install .      
+      - name: Run unit tests
+        run: |
+          .venv\Scripts\Activate.ps1
+          python -m unittest discover -s tests.runner --verbose
+          pytest -n auto

build_libicsneo.py

@@ -1,3 +1,4 @@
+import platform
 import subprocess
 import multiprocessing
 import os
@@ -50,33 +51,48 @@ def checkout():
 def _build_libusb():
     os.makedirs(LIBUSB_BUILD, exist_ok=True)
     env = os.environ.copy()
-    if sys.platform == "darwin":
-        env["CFLAGS"] = "-arch x86_64 -arch arm64 -mmacosx-version-min=10.13"
-        env["CXXFLAGS"] = "-arch x86_64 -arch arm64 -mmacosx-version-min=10.13"
+    if "DARWIN" in platform.system().upper():
+        env["CFLAGS"] = "-arch arm64 -mmacosx-version-min=10.13"
+        env["CXXFLAGS"] = "-arch arm64 -mmacosx-version-min=10.13"
+        env["LDFLAGS"] = "-arch arm64 -mmacosx-version-min=10.13"
+
+        # os.environ.update(env)
+
+        # os.system('echo $CFLAGS')
+        # os.system('echo $CXXFLAGS')
+        # os.system('echo $LDFLAGS')
+
+        print("CFLAGS:", env["CFLAGS"])
+        print("CXXFLAGS:", env["CXXFLAGS"])
+        print("LDFLAGS:", env["LDFLAGS"])
     else:
         env["CFLAGS"] = "-fPIC"
         env["CXXFLAGS"] = "-fPIC"
-    subprocess.check_output([
+    result = subprocess.run([
         f"{LIBUSB_SOURCE}/configure",
         "--disable-shared",
         "--enable-static",
+        "--disable-dependency-tracking",
         f"--prefix={LIBUSB_INSTALL}",
         "--disable-udev"
     ], cwd=LIBUSB_BUILD, env=env)
 
-    subprocess.check_output(["make", "-j" + CPUS], cwd=LIBUSB_BUILD)
-    subprocess.check_output(["make", "install"], cwd=LIBUSB_BUILD)
+    print("stdout:", result.stdout)
+    print("stderr:", result.stderr)
+
+    subprocess.run(["make", "-j" + CPUS], cwd=LIBUSB_BUILD)
+    subprocess.run(["make", "install"], cwd=LIBUSB_BUILD)
 
 def _build_libpcap():
     os.makedirs(LIBPCAP_BUILD, exist_ok=True)
     env = os.environ.copy()
-    if sys.platform == "darwin":
-        env["CFLAGS"] = "-arch x86_64 -arch arm64 -mmacosx-version-min=10.13"
-        env["CXXFLAGS"] = "-arch x86_64 -arch arm64 -mmacosx-version-min=10.13"
+    if "DARWIN" in platform.system().upper():
+        env["CFLAGS"] = "-arch arm64 -mmacosx-version-min=10.13"
+        env["CXXFLAGS"] = "-arch arm64 -mmacosx-version-min=10.13"
     else:
         env["CFLAGS"] = "-fPIC"
         env["CXXFLAGS"] = "-fPIC"
-    subprocess.check_output([
+    subprocess.run([
         f"{LIBPCAP_SOURCE}/configure",
         "--disable-shared",
         "--disable-usb",
@@ -93,8 +109,8 @@ def _build_libpcap():
         f"--prefix={LIBPCAP_INSTALL}",
     ], cwd=LIBPCAP_BUILD, env=env)
 
-    subprocess.check_output(["make", "-j" + CPUS], cwd=LIBPCAP_BUILD)
-    subprocess.check_output(["make", "install"], cwd=LIBPCAP_BUILD)
+    subprocess.run(["make", "-j" + CPUS], cwd=LIBPCAP_BUILD)
+    subprocess.run(["make", "install"], cwd=LIBPCAP_BUILD)
 
 def _build_libicsneo_linux():
     print("Cleaning libicsneo...")
@@ -119,11 +135,11 @@ def _build_libicsneo_linux():
     )
 
 def _build_libicsneo_macos():
-    subprocess.check_output(
+    subprocess.run(
         [
             "cmake",
             "-DCMAKE_BUILD_TYPE=Release",
-            "-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64",
+            "-DCMAKE_OSX_ARCHITECTURES=arm64;arm64",
             "-DLIBICSNEO_BUILD_ICSNEOLEGACY=ON",
             "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13",
             f"-DCMAKE_PREFIX_PATH={LIBUSB_INSTALL};{LIBPCAP_INSTALL}",
@@ -132,7 +148,7 @@ def _build_libicsneo_macos():
         ]
     )
 
-    subprocess.check_output(
+    subprocess.run(
         ["cmake", "--build", LIBICSNEO_BUILD, "--target", "icsneolegacy", "--parallel", CPUS]
     )
 

setup.py

@@ -85,7 +85,7 @@ def get_ics_extension_compiler_arguments() -> List[str]:
         compile_args = GCC_COMPILE_ARGS
     elif "DARWIN" in platform.system().upper():
         # Mac doesn't respect the compiler args, but will append with ARCHFLAGS environment variable
-        os.environ["ARCHFLAGS"] += " -std=c++17"
+        os.environ["ARCHFLAGS"] = os.environ.get("ARCHFLAGS", "") + " -std=c++17"
         compile_args = []
     else:
         compile_args = []

tests/runner/Readme.md

@@ -3,12 +3,39 @@ Runner tests
 
 This directory is specifically for testing against hardware attached to the runner.
 
-Each runner consists of the following hardware:
-
+Each runner consists of the following ICS hardware:
 - neoVI FIRE3
 - neoVI FIRE2
 - ValueCAN4-2
-
-
 - RAD-Moon2
 - RAD-Moon2
+
+Runner platforms:
+- Windows 10
+- MacOS (something? M1)
+- Linux (Debian)
+- Linux ARM (Raspberry PI)
+
+Hardware setup:
+PC -> USB -> NIC -> ETH -> Fire3 -> CAN1/2 network v v
+                                 -> LIN network    | | V
+                                 -> ETH network    | | | V
+          -> Fire2 -> CAN1/2 network             v | ^ | |
+                   -> LIN network                | |   ^ |
+                   -> ETH network                | |     ^
+          -> VCAN42 -> CAN1/2 network            ^ ^
+          -> NIC -> ETH -> Moon2 -> 100/1000BASE-T1 network v
+          -> NIC -> ETH -> Moon2 -> 100/1000BASE-T1 network ^
+
+Software setup:
+- Both Moon2 USB NIC adapter properties must be set:
+    - "ASIX USB to Gigabit Ethernet Family Adapter" -> "Ethernet" (windows 10)
+    - "ASIX USB to Gigabit Ethernet Family Adapter #2" -> "Ethernet 2" (windows 10)
+        - IPV6 disabled
+        - IPV4 IP address: 192.168.69.10, 192.168.69.11
+        - IPV4 subnet mask: 255.255.255.0
+
+Hardware / software testing:
+- Run all python ics functions on all hardware
+- Verify all networks, transmit, recieve, message functions
+- Verify all example scripts are fully working