Skip to content

Commit

Permalink
Cleaning up/
Browse files Browse the repository at this point in the history
  • Loading branch information
agarny authored Nov 22, 2024
2 parents f7e1be2 + 3150bca commit 5614724
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 11 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -405,10 +405,10 @@ else()

if(APPLE)
set(LIBOPENCOR_TARGET_ARCHITECTURE_DOCSTRING "Specify the target architecture (Intel or ARM).")
set(LIBOPENCOR_TARGET_ARCHITECTURE ${DEFAULT_TARGET_ARCHITECTURE} CACHE BOOL "${LIBOPENCOR_TARGET_ARCHITECTURE_DOCSTRING}")
set(LIBOPENCOR_TARGET_ARCHITECTURE ${DEFAULT_TARGET_ARCHITECTURE} CACHE STRING "${LIBOPENCOR_TARGET_ARCHITECTURE_DOCSTRING}")

if(NOT "${TARGET_ARCHITECTURE}" STREQUAL "")
set(LIBOPENCOR_TARGET_ARCHITECTURE ${TARGET_ARCHITECTURE} CACHE BOOL "${LIBOPENCOR_TARGET_ARCHITECTURE_DOCSTRING}" FORCE)
set(LIBOPENCOR_TARGET_ARCHITECTURE ${TARGET_ARCHITECTURE} CACHE STRING "${LIBOPENCOR_TARGET_ARCHITECTURE_DOCSTRING}" FORCE)
endif()

unset(TARGET_ARCHITECTURE CACHE)
Expand Down
4 changes: 1 addition & 3 deletions tests/bindings/javascript/utils.js.in
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,8 @@ export function expectIssues(libopencor, logger, expectedIssues) {

if (issues.get(i).type() === libopencor.Issue.Type.ERROR) {
expect(issues.get(i).typeAsString()).toBe("Error");
} else if (issues.get(i).type() === libopencor.Issue.Type.WARNING) {
expect(issues.get(i).typeAsString()).toBe("Warning");
} else {
expect(issues.get(i).typeAsString()).toBe("Message");
expect(issues.get(i).typeAsString()).toBe("Warning");
}
}
}
Expand Down
4 changes: 1 addition & 3 deletions tests/bindings/python/utils.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,8 @@ def assert_issues(logger, expected_issues):

if issues[i].type == oc.Issue.Type.Error:
assert issues[i].type_as_string == "Error"
elif issues[i].type == oc.Issue.Type.Warning:
assert issues[i].type_as_string == "Warning"
else:
assert issues[i].type_as_string == "Message"
assert issues[i].type_as_string == "Warning"


def assert_values(
Expand Down
4 changes: 1 addition & 3 deletions tests/utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,8 @@ void expectEqualIssues(const LoggerPtr &pLogger, const ExpectedIssues &pExpected

if (issues[i]->type() == Issue::Type::ERROR) {
EXPECT_EQ(issues[i]->typeAsString(), "Error");
} else if (issues[i]->type() == Issue::Type::WARNING) {
EXPECT_EQ(issues[i]->typeAsString(), "Warning");
} else {
EXPECT_EQ(issues[i]->typeAsString(), "Message");
EXPECT_EQ(issues[i]->typeAsString(), "Warning");
}
}
}
Expand Down

0 comments on commit 5614724

Please sign in to comment.