Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

encapsulate linux test #7751

Merged
merged 3 commits into from
Feb 17, 2021
Merged

encapsulate linux test #7751

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39a5f35
encapulate the content of internal-tests-linux.cpp with #ifdef __linu…
doronhi Nov 10, 2020
c536aa2
add file internal-tests-linux.cpp to linux project only.
doronhi Feb 2, 2021
0d9597f
Prevent internal-tests-linux.cpp to be built in Android
doronhi Feb 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion unit-tests/internal/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,14 @@ set (INTERNAL_TESTS_SOURCES
internal-tests-types.cpp
internal-tests-uv-map.cpp
internal-tests-class-logic.cpp
internal-tests-linux.cpp
../catch.h
../approx.h
)

if(UNIX)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UNIX includes Android as well. If it doesn't apply then it should be unix && !android

list(APPEND INTERNAL_TESTS_SOURCES internal-tests-linux.cpp)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indentation

endif()

add_executable(${PROJECT_NAME} ${INTERNAL_TESTS_SOURCES})
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)
target_link_libraries(${PROJECT_NAME} ${DEPENDENCIES})
Expand Down
3 changes: 2 additions & 1 deletion unit-tests/internal/internal-tests-linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,4 +187,5 @@ TEST_CASE("named_mutex_processes", "[code]")
sem_close(sem2);
REQUIRE(child_alive == actual_test);
}
}
}