zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows build systems: use ninja and enable tests (#33589)

Browse Source 
* Set default CMake generator is ninja on Windows
* Enable build systems tests (except for autotools/make)
This commit is contained in:
markus-ferrell 2023-08-10 13:16:23 -04:00 committed by GitHub
parent 37634f8b08
commit f3c080e546
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/spack/spack/build_systems/cmake.py
View File

@ -248,7 +248,8 @@ def std_cmake_args(self):
@staticmethod @staticmethod
def std_args(pkg, generator=None): def std_args(pkg, generator=None):
"""Computes the standard cmake arguments for a generic package""" """Computes the standard cmake arguments for a generic package"""
generator = generator or "Unix Makefiles" default_generator = "Ninja" if sys.platform == "win32" else "Unix Makefiles"
generator = generator or default_generator
valid_primary_generators = ["Unix Makefiles", "Ninja"] valid_primary_generators = ["Unix Makefiles", "Ninja"]
primary_generator = _extract_primary_generator(generator) primary_generator = _extract_primary_generator(generator)
if primary_generator not in valid_primary_generators: if primary_generator not in valid_primary_generators:

4
lib/spack/spack/test/build_systems.py
View File

@ -23,8 +23,6 @@
DATA_PATH = os.path.join(spack.paths.test_path, "data") DATA_PATH = os.path.join(spack.paths.test_path, "data")
pytestmark = pytest.mark.skipif(sys.platform == "win32", reason="does not run on windows")
@pytest.fixture() @pytest.fixture()
def concretize_and_setup(default_mock_concretization): def concretize_and_setup(default_mock_concretization):
@ -45,6 +43,7 @@ def _func(dir_str):
return _func return _func
@pytest.mark.skipif(sys.platform == "win32", reason="make not available on Windows")
@pytest.mark.usefixtures("config", "mock_packages", "working_env") @pytest.mark.usefixtures("config", "mock_packages", "working_env")
class TestTargets: class TestTargets:
@pytest.mark.parametrize( @pytest.mark.parametrize(
@ -93,6 +92,7 @@ def test_negative_ninja_check(self, input_dir, test_dir, concretize_and_setup):
s.package._if_ninja_target_execute("check") s.package._if_ninja_target_execute("check")
@pytest.mark.skipif(sys.platform == "win32", reason="autotools not available on windows")
@pytest.mark.usefixtures("config", "mock_packages") @pytest.mark.usefixtures("config", "mock_packages")
class TestAutotoolsPackage: class TestAutotoolsPackage:
def test_with_or_without(self, default_mock_concretization): def test_with_or_without(self, default_mock_concretization):