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

Windows/testing: enable tests for "spack find" (#33588)

Browse Source
This commit is contained in:
markus-ferrell 2023-01-20 20:54:06 -05:00 committed by GitHub
parent a424f7f173
commit c3e3c392a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/spack/spack/test/cmd/find.py
View File

@ -25,8 +25,6 @@
base32_alphabet = "abcdefghijklmnopqrstuvwxyz234567" base32_alphabet = "abcdefghijklmnopqrstuvwxyz234567"
pytestmark = pytest.mark.skipif(sys.platform == "win32", reason="does not run on windows")
@pytest.fixture(scope="module") @pytest.fixture(scope="module")
def parser(): def parser():
@ -131,15 +129,28 @@ def test_namespaces_shown_correctly(database):
@pytest.mark.db @pytest.mark.db
def test_find_cli_output_format(database, mock_tty_stdout): def test_find_cli_output_format(database, mock_tty_stdout):
# Currently logging on Windows detaches stdout
# from the terminal so we miss some output during tests
# TODO: (johnwparent): Once logging is amended on Windows,
# restore this test
out = find("zmpi") out = find("zmpi")
assert out.endswith( if not sys.platform == "win32":
dedent( assert out.endswith(
"""\ dedent(
zmpi@1.0 """\
==> 1 installed package zmpi@1.0
""" ==> 1 installed package
"""
)
)
else:
assert out.endswith(
dedent(
"""\
zmpi@1.0
"""
)
) )
)
def _check_json_output(spec_list): def _check_json_output(spec_list):
@ -349,6 +360,7 @@ def test_find_command_basic_usage(database):
assert "mpileaks" in output assert "mpileaks" in output
@pytest.mark.skipif(sys.platform == "win32", reason="envirnment is not yet supported on windows")
@pytest.mark.regression("9875") @pytest.mark.regression("9875")
def test_find_prefix_in_env( def test_find_prefix_in_env(
mutable_mock_env_path, install_mockery, mock_fetch, mock_packages, mock_archive, config mutable_mock_env_path, install_mockery, mock_fetch, mock_packages, mock_archive, config

5
var/spack/repos/builtin.mock/packages/callpath/package.py
View File

@ -18,9 +18,8 @@ class Callpath(Package):
depends_on("mpi") depends_on("mpi")
def install(self, spec, prefix): def install(self, spec, prefix):
configure("--prefix=%s" % prefix) mkdirp(prefix)
make() touch(join_path(prefix, "dummyfile"))
make("install")
def setup_run_environment(self, env): def setup_run_environment(self, env):
env.set("FOOBAR", self.name) env.set("FOOBAR", self.name)

5
var/spack/repos/builtin.mock/packages/dyninst/package.py
View File

@ -30,6 +30,5 @@ class Dyninst(Package):
depends_on("libdwarf") depends_on("libdwarf")
def install(self, spec, prefix): def install(self, spec, prefix):
configure("--prefix=%s" % prefix) mkdirp(prefix)
make() touch(join_path(prefix, "dummyfile"))
make("install")