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

conditional deps: fix parsing tests

Browse Source 
Signed-off-by: Gregory Becker <becker33@llnl.gov>
This commit is contained in:
Gregory Becker 2025-05-15 14:00:55 -07:00
parent b03d5b7885
commit 452a84d9eb
No known key found for this signature in database
GPG Key ID: 2362541F6D14ED84
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/spack/spack/spec_parser.py
View File

@ -201,7 +201,10 @@ def expect(self, *kinds: SpecTokens):
return self.next_token and self.next_token.kind in kinds return self.next_token and self.next_token.kind in kinds
def push(self, token_stream: Iterator[Token]): def push(self, token_stream: Iterator[Token]):
self.token_stream = itertools.chain(token_stream, self.token_stream) # New tokens need to go before next_token, which comes before the rest of the stream
self.token_stream = itertools.chain(token_stream, (self.next_token,), self.token_stream)
self.current_token = None
self.next_token = None
self.advance() self.advance()

8
lib/spack/spack/test/spec_syntax.py
View File

@ -902,12 +902,12 @@ def test_cli_spec_roundtrip(args, expected):
( (
"foo%my_toolchain", "foo%my_toolchain",
{"my_toolchain": "%[when='%c' virtuals=c]gcc"}, {"my_toolchain": "%[when='%c' virtuals=c]gcc"},
"foo ^[when='%c' virtuals=c] gcc", ["foo %[when='%c' virtuals=c] gcc"],
), ),
( (
"foo%my_toolchain2", "foo%my_toolchain2",
{"my_toolchain2": "%[when='%c' virtuals=c]gcc ^[when='+mpi' virtuals=mpi]mpich"}, {"my_toolchain2": "%[when='%c' virtuals=c]gcc ^[when='+mpi' virtuals=mpi]mpich"},
"foo %[when='%c' virtuals=c] gcc ^[when='+mpi' virtuals=mpi] mpich", ["foo %[when='%c' virtuals=c] gcc ^[when='+mpi' virtuals=mpi] mpich"],
), ),
( (
"foo%my_toolchain bar%my_toolchain2", "foo%my_toolchain bar%my_toolchain2",
@ -916,7 +916,7 @@ def test_cli_spec_roundtrip(args, expected):
"my_toolchain2": "%[when='%c' virtuals=c]gcc ^[when='+mpi' virtuals=mpi]mpich", "my_toolchain2": "%[when='%c' virtuals=c]gcc ^[when='+mpi' virtuals=mpi]mpich",
}, },
[ [
"foo ^[when='%c' virtuals=c] gcc", "foo %[when='%c' virtuals=c] gcc",
"bar %[when='%c' virtuals=c] gcc ^[when='+mpi' virtuals=mpi] mpich", "bar %[when='%c' virtuals=c] gcc ^[when='+mpi' virtuals=mpi] mpich",
], ],
), ),
@ -926,7 +926,7 @@ def test_parse_toolchain(spec_str, toolchain, expected_roundtrip, mutable_config
spack.config.CONFIG.set("toolchains", toolchain) spack.config.CONFIG.set("toolchains", toolchain)
parser = SpecParser(spec_str) parser = SpecParser(spec_str)
for expected in expected_roundtrip: for expected in expected_roundtrip:
assert expected_roundtrip == str(parser.next_spec()) assert expected == str(parser.next_spec())
@pytest.mark.parametrize( @pytest.mark.parametrize(