Merge pull request #1196 from jack1142/remove_dependency_on_unix_tools_in_windows

Remove dependency on Unix tools in Windows test suite
This commit is contained in:
Joe Rickerby
2022-07-30 15:10:07 +01:00
committed by GitHub
2 changed files with 20 additions and 12 deletions
+3 -1
View File
@@ -2,6 +2,7 @@ from __future__ import annotations
import os
import subprocess
import sys
import textwrap
import pytest
@@ -35,6 +36,7 @@ project_with_environment_asserts = test_projects.new_c_project(
def test(tmp_path):
python_echo = f"'{sys.executable}' -c \"import sys; print(*sys.argv[1:])\""
project_dir = tmp_path / "project"
project_with_environment_asserts.generate(project_dir)
@@ -45,7 +47,7 @@ def test(tmp_path):
project_dir,
add_env={
"CIBW_ENVIRONMENT": """CIBW_TEST_VAR="a b c" CIBW_TEST_VAR_2=1 CIBW_TEST_VAR_3="$(echo 'test string 3')" PATH=$PATH:/opt/cibw_test_path""",
"CIBW_ENVIRONMENT_WINDOWS": '''CIBW_TEST_VAR="a b c" CIBW_TEST_VAR_2=1 CIBW_TEST_VAR_3="$(echo 'test string 3')" PATH="$PATH;/opt/cibw_test_path"''',
"CIBW_ENVIRONMENT_WINDOWS": f'''CIBW_TEST_VAR="a b c" CIBW_TEST_VAR_2=1 CIBW_TEST_VAR_3="$({python_echo} 'test string 3')" PATH="$PATH;/opt/cibw_test_path"''',
},
)