Skip to content

Commit b87ba98

Browse files
committed
Updated expected results for SOME_CONFIG config in helloworld_test.py
1 parent a70058a commit b87ba98

2 files changed

Lines changed: 18 additions & 18 deletions

File tree

test/cli/helloworld_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def test_addon_relative_path():
107107
filename = os.path.join('helloworld', 'main.c')
108108
assert ret == 0, stdout
109109
assert stdout == ('Checking %s ...\n'
110-
'Checking %s: SOME_CONFIG...\n' % (filename, filename))
110+
'Checking %s: SOME_CONFIG=SOME_CONFIG...\n' % (filename, filename))
111111
assert stderr == ('[%s:5]: (error) Division by zero.\n'
112112
'[%s:4]: (style) misra violation (use --rule-texts=<file> to get proper output)\n' % (filename, filename))
113113

@@ -125,7 +125,7 @@ def test_addon_with_gui_project(tmp_path):
125125
assert ret == 0, stdout
126126
assert stdout.strip().split('\n') == [
127127
'Checking %s ...' % filename,
128-
'Checking %s: SOME_CONFIG...' % filename
128+
'Checking %s: SOME_CONFIG=SOME_CONFIG...' % filename
129129
]
130130
assert stderr == ('[%s:5]: (error) Division by zero.\n'
131131
'[%s:4]: (style) misra violation (use --rule-texts=<file> to get proper output)\n' % (filename, filename))

test/testpreprocessor.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2405,28 +2405,28 @@ class TestPreprocessor : public TestFixture {
24052405

24062406
void getConfigsIssue14317() {
24072407
const char filedata[] = "bool test() {\n"
2408-
"return\n"
2409-
"#if defined(isless)\n"
2410-
"0 != isless(1.0, 2.0)\n"
2411-
"#else\n"
2412-
"0\n"
2413-
"#endif\n"
2414-
";\n"
2415-
"}\n";
2408+
"return\n"
2409+
"#if defined(isless)\n"
2410+
"0 != isless(1.0, 2.0)\n"
2411+
"#else\n"
2412+
"0\n"
2413+
"#endif\n"
2414+
";\n"
2415+
"}\n";
24162416
ASSERT_EQUALS("\nisless=isless\n", getConfigsStr(filedata));
24172417
}
24182418

24192419
void getCodeIssue14317() {
24202420
// Handling include guards..
24212421
const char filedata[] = "bool test() {\n"
2422-
"return\n"
2423-
"#if defined(isless)\n"
2424-
"0 != isless(1.0, 2.0)\n"
2425-
"#else\n"
2426-
"0\n"
2427-
"#endif\n"
2428-
";\n"
2429-
"}\n";
2422+
"return\n"
2423+
"#if defined(isless)\n"
2424+
"0 != isless(1.0, 2.0)\n"
2425+
"#else\n"
2426+
"0\n"
2427+
"#endif\n"
2428+
";\n"
2429+
"}\n";
24302430

24312431
// Preprocess => actual result..
24322432
const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);

0 commit comments

Comments
 (0)