Fix tsan

Author: crusaderky

Tools/pixi-packages/asan/variants.yaml

@@ -1,6 +1,6 @@
 variant:
   - asan
 abi_tag:
-  - cp315
+  - cp315_asan
 version:
   - 3.15

Tools/pixi-packages/build.sh

@@ -1,25 +1,23 @@
 #!/bin/bash
 
+echo "PYTHON_VARIANT: ${PYTHON_VARIANT}"
+
 if [[ "${PYTHON_VARIANT}" == "freethreading" ]]; then
-    echo "BUILD TYPE: FREE-THREADING"
-    BUILD_DIR="../build_freethreading"
     CONFIGURE_EXTRA="--disable-gil"
 elif [[ "${PYTHON_VARIANT}" == "asan" ]]; then
-    echo "BUILD TYPE: ASAN"
-    BUILD_DIR="../build_asan"
     CONFIGURE_EXTRA="--with-address-sanitizer"
     export ASAN_OPTIONS="strict_init_order=true"
 elif [[ "${PYTHON_VARIANT}" == "tsan-freethreading" ]]; then
-    echo "BUILD TYPE: TSAN FREE-THREADING"
-    BUILD_DIR="../build_tsan-freethreading"
     CONFIGURE_EXTRA="--disable-gil --with-thread-sanitizer"
     export TSAN_OPTIONS="suppressions=${SRC_DIR}/Tools/tsan/suppressions_free_threading.txt"
-else
-    echo "BUILD TYPE: DEFAULT"
-    BUILD_DIR="../build"
+elif [[ "${PYTHON_VARIANT}" == "default" ]]; then
     CONFIGURE_EXTRA=""
+else
+    echo "Unknown PYTHON_VARIANT: ${PYTHON_VARIANT}"
+    exit 1
 fi
 
+BUILD_DIR="../build_${PYTHON_VARIANT}"
 mkdir -p "${BUILD_DIR}"
 cd "${BUILD_DIR}"
 

Tools/pixi-packages/default/recipe.yaml

@@ -13,16 +13,16 @@ outputs:
     name: python_abi
     version: ${{ version }}
   build:
-    string: "0_${{ variant }}_${{ abi_tag }}"
+    string: "0_${{ abi_tag }}"
   requirements:
     run_constraints:
-      - python ${{ version }}.* *_${{ variant }}_${{ abi_tag }}
+      - python ${{ version }}.* *_${{ abi_tag }}
 
 - package:
     name: python
     version: ${{ version }}
   build:
-    string: "0_${{ variant }}_${{ abi_tag }}"
+    string: "0_${{ abi_tag }}"
     files:
       exclude:
         - "*.o"
@@ -77,7 +77,7 @@ outputs:
       noarch:
         - python
       weak:
-        - python_abi ${{ version }}.* *_${{ variant }}_${{ abi_tag }}
+        - python_abi ${{ version }}.* *_${{ abi_tag }}
 
 about:
   homepage: https://www.python.org/

Tools/pixi-packages/tsan-freethreading/variants.yaml

@@ -1,6 +1,6 @@
 variant:
   - tsan-freethreading
 abi_tag:
-  - cp315t
+  - cp315t_tsan
 version:
   - 3.15