Merge remote-tracking branch 'origin/GP-0_d-millar_test_failure_fix'

This commit is contained in:
Ryan Kurtz 2024-11-21 11:02:02 -05:00
commit 7dd38f2d95
2 changed files with 6 additions and 4 deletions

View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -251,6 +251,7 @@ public class GdbCommandsTest extends AbstractGdbTraceRmiTest {
Selected Ghidra compiler: gcc""",
extractOutSection(out, "---File---"));
assertEquals("""
Toy:BE:64:default not found in compiler map
Selected Ghidra language: Toy:BE:64:default
Selected Ghidra compiler: default""",
extractOutSection(out, "---Language---"));

View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -243,6 +243,7 @@ public class LldbCommandsTest extends AbstractLldbTraceRmiTest {
Selected Ghidra compiler: %s""".formatted(PLAT.lang(), PLAT.cSpec()),
extractOutSection(out, "---File---"));
assertEquals("""
Toy:BE:64:default not found in compiler map
Selected Ghidra language: Toy:BE:64:default
Selected Ghidra compiler: default""",
extractOutSection(out, "---Language---"));