fix tests on macos

Author: yangao07

tests/test_cmake_dispatch.sh

@@ -19,7 +19,7 @@ if ! cmake -B "$BUILD_DIR" -S . -DCMAKE_BUILD_TYPE=Release >/dev/null 2>&1; then
 fi
 
 if [ $ERRORS -eq 0 ]; then
-    if ! cmake --build "$BUILD_DIR" -j$(nproc) >/dev/null 2>&1; then
+    if ! cmake --build "$BUILD_DIR" -j$(sysctl -n hw.logicalcpu 2>/dev/null || nproc 2>/dev/null || echo 4) >/dev/null 2>&1; then
         echo "FAIL: cmake build failed"
         ERRORS=$((ERRORS + 1))
     fi
@@ -37,23 +37,35 @@ if [ -z "$CMAKE_LIB" ]; then
     exit 1
 fi
 
-SYMBOLS=$(nm -g "$CMAKE_LIB" 2>/dev/null | grep " T " | awk '{print $3}')
+SYMBOLS=$(nm -g "$CMAKE_LIB" 2>/dev/null | grep " T " | awk '{print $3}' | sed 's/^_//')
 
-# Check for per-ISA dispatch symbols
-for sym in simd_sse2_abpoa_align_sequence_to_subgraph \
-           simd_sse41_abpoa_align_sequence_to_subgraph \
-           simd_avx2_abpoa_align_sequence_to_subgraph \
-           simd_avx512_abpoa_align_sequence_to_subgraph \
-           simd_abpoa_align_sequence_to_subgraph \
-           simd_abpoa_align_sequence_to_graph; do
-    if ! echo "$SYMBOLS" | grep -qx "$sym"; then
-        echo "FAIL: dispatch symbol '$sym' not found in CMake-built library"
-        ERRORS=$((ERRORS + 1))
-    fi
-done
+ARCH=$(uname -m)
+if [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "amd64" ]; then
+    # Check for per-ISA dispatch symbols (x86 only)
+    for sym in simd_sse2_abpoa_align_sequence_to_subgraph \
+               simd_sse41_abpoa_align_sequence_to_subgraph \
+               simd_avx2_abpoa_align_sequence_to_subgraph \
+               simd_avx512_abpoa_align_sequence_to_subgraph \
+               simd_abpoa_align_sequence_to_subgraph \
+               simd_abpoa_align_sequence_to_graph; do
+        if ! echo "$SYMBOLS" | grep -qx "$sym"; then
+            echo "FAIL: dispatch symbol '$sym' not found in CMake-built library"
+            ERRORS=$((ERRORS + 1))
+        fi
+    done
+else
+    # Non-x86: just verify the generic align symbols are present
+    for sym in simd_abpoa_align_sequence_to_subgraph \
+               simd_abpoa_align_sequence_to_graph; do
+        if ! echo "$SYMBOLS" | grep -qx "$sym"; then
+            echo "FAIL: dispatch symbol '$sym' not found in CMake-built library"
+            ERRORS=$((ERRORS + 1))
+        fi
+    done
+fi
 
 # Compare output with Makefile reference
-CMAKE_BIN=$(find "$BUILD_DIR" -name 'abpoa' -type f -executable | head -1)
+CMAKE_BIN=$(find "$BUILD_DIR" -name 'abpoa' -type f -perm +111 | head -1)
 if [ -z "$CMAKE_BIN" ]; then
     echo "FAIL: abpoa binary not found in CMake build"
     ERRORS=$((ERRORS + 1))

tests/test_cmake_lib_only.sh

@@ -18,7 +18,7 @@ if ! cmake -B "$BUILD_DIR" -S . -DABPOA_BUILD_EXE=OFF \
     echo "FAIL: cmake configure failed (ABPOA_BUILD_EXE=OFF)"
     exit 1
 fi
-if ! cmake --build "$BUILD_DIR" -j$(nproc) >/dev/null 2>&1; then
+if ! cmake --build "$BUILD_DIR" -j$(sysctl -n hw.logicalcpu 2>/dev/null || nproc 2>/dev/null || echo 4) >/dev/null 2>&1; then
     echo "FAIL: cmake build failed (ABPOA_BUILD_EXE=OFF)"
     exit 1
 fi
@@ -32,7 +32,7 @@ else
 fi
 
 # Binary must NOT exist
-if find "$BUILD_DIR" -name 'abpoa' -type f -executable | grep -q .; then
+if find "$BUILD_DIR" -name 'abpoa' -type f -perm +111 | grep -q .; then
     echo "FAIL: abpoa binary found in lib-only build (should be disabled)"
     ERRORS=$((ERRORS + 1))
 fi
@@ -45,12 +45,12 @@ if ! cmake -B "$BUILD_DIR2" -S . -DCMAKE_BUILD_TYPE=Release >/dev/null 2>&1; the
     echo "FAIL: cmake configure failed (default build)"
     exit 1
 fi
-if ! cmake --build "$BUILD_DIR2" -j$(nproc) >/dev/null 2>&1; then
+if ! cmake --build "$BUILD_DIR2" -j$(sysctl -n hw.logicalcpu 2>/dev/null || nproc 2>/dev/null || echo 4) >/dev/null 2>&1; then
     echo "FAIL: cmake build failed (default build)"
     exit 1
 fi
 
-if ! find "$BUILD_DIR2" -name 'abpoa' -type f -executable | grep -q .; then
+if ! find "$BUILD_DIR2" -name 'abpoa' -type f -perm +111 | grep -q .; then
     echo "FAIL: abpoa binary not found in default build (should be built)"
     ERRORS=$((ERRORS + 1))
 fi

tests/test_portable_alloc.sh

@@ -35,7 +35,13 @@ fi
 
 # Compile and run the alignment verification test
 if [ -f tests/test_aligned_alloc.c ]; then
-    if gcc -march=native tests/test_aligned_alloc.c -I src -I include \
+    ARCH=$(uname -m)
+    if [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "amd64" ]; then
+        EXTRA_DEFS=""
+    else
+        EXTRA_DEFS="-DUSE_SIMDE -DSIMDE_ENABLE_NATIVE_ALIASES"
+    fi
+    if gcc -march=native $EXTRA_DEFS tests/test_aligned_alloc.c -I src -I include \
            -o /tmp/test_aligned_alloc 2>/tmp/test_aligned_alloc.err; then
         if ! /tmp/test_aligned_alloc; then
             echo "FAIL: aligned allocation test failed at runtime"

tests/test_symbol_namespacing.sh

@@ -14,7 +14,7 @@ if [ ! -f "$LIB" ]; then
     exit 1
 fi
 
-SYMBOLS=$(nm -g "$LIB" 2>/dev/null | grep " T " | awk '{print $3}')
+SYMBOLS=$(nm -g "$LIB" 2>/dev/null | grep " T " | awk '{print $3}' | sed 's/^_//')
 ERRORS=0
 
 # These bare symbols must NOT appear