rarias/ovni
rarias/ovni
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Enable emu and rt tests for nanos6 and ovni

Browse Source
This commit is contained in:
Rodrigo Arias 2023-02-02 14:00:50 +01:00 committed by Rodrigo Arias Mallo
parent 4e2164646c
commit e674c92f13
8 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/CMakeLists.txt
View File

@ -7,9 +7,16 @@ add_library(parson STATIC parson.c)
target_include_directories(parson PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") target_include_directories(parson PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
set_property(TARGET parson PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET parson PROPERTY POSITION_INDEPENDENT_CODE ON)
add_library(common STATIC common.c)
target_include_directories(common PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
set_property(TARGET common PROPERTY POSITION_INDEPENDENT_CODE ON)
add_library(parson-static STATIC parson.c) add_library(parson-static STATIC parson.c)
target_include_directories(parson-static PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") target_include_directories(parson-static PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
add_library(common-static STATIC common.c)
target_include_directories(common-static PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
configure_file("config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/config.h" ) configure_file("config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/config.h" )
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})

4
src/rt/CMakeLists.txt
View File

@ -4,14 +4,14 @@
include_directories("${CMAKE_SOURCE_DIR}/src/include") include_directories("${CMAKE_SOURCE_DIR}/src/include")
add_library(ovni SHARED ovni.c) add_library(ovni SHARED ovni.c)
target_link_libraries(ovni parson) target_link_libraries(ovni parson common)
target_include_directories(ovni PUBLIC "${CMAKE_SOURCE_DIR}/include") target_include_directories(ovni PUBLIC "${CMAKE_SOURCE_DIR}/include")
set_target_properties(ovni PROPERTIES set_target_properties(ovni PROPERTIES
VERSION 1.0.0 VERSION 1.0.0
SOVERSION 1) SOVERSION 1)
add_library(ovni-static STATIC ovni.c) add_library(ovni-static STATIC ovni.c)
target_link_libraries(ovni-static parson-static) target_link_libraries(ovni-static parson-static common-static)
target_include_directories(ovni-static PUBLIC "${CMAKE_SOURCE_DIR}/include") target_include_directories(ovni-static PUBLIC "${CMAKE_SOURCE_DIR}/include")
install(TARGETS ovni LIBRARY DESTINATION lib) install(TARGETS ovni LIBRARY DESTINATION lib)

4
test/CMakeLists.txt
View File

@ -7,5 +7,5 @@ set(OVNI_TEST_BUILD_DIR "${CMAKE_BINARY_DIR}/test")
include(macros.cmake) include(macros.cmake)
add_subdirectory(unit) add_subdirectory(unit)
#add_subdirectory(emu) add_subdirectory(emu)
#add_subdirectory(rt) add_subdirectory(rt)

2
test/emu/CMakeLists.txt
View File

@ -2,5 +2,5 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
add_subdirectory(ovni) add_subdirectory(ovni)
add_subdirectory(nosv) #add_subdirectory(nosv)
add_subdirectory(nanos6) add_subdirectory(nanos6)

2
test/emu/nanos6/CMakeLists.txt
View File

@ -3,7 +3,7 @@
ovni_test(nested-tasks.c) ovni_test(nested-tasks.c)
ovni_test(nested-tasks-bad.c SHOULD_FAIL ovni_test(nested-tasks-bad.c SHOULD_FAIL
REGEX "fatal: cannot execute task 1: state is not created") REGEX "cannot execute task 1: state is not created")
ovni_test(task-types.c MP) ovni_test(task-types.c MP)
ovni_test(blocking.c MP) ovni_test(blocking.c MP)
ovni_test(ss-mismatch.c SHOULD_FAIL ovni_test(ss-mismatch.c SHOULD_FAIL

2
test/emu/ovni/flush.c
View File

@ -35,7 +35,7 @@ static void
emit(uint8_t *buf, size_t size) emit(uint8_t *buf, size_t size)
{ {
struct ovni_ev ev = {0}; struct ovni_ev ev = {0};
ovni_ev_set_mcv(&ev, "O$$"); ovni_ev_set_mcv(&ev, "OB.");
ovni_ev_set_clock(&ev, ovni_clock_now()); ovni_ev_set_clock(&ev, ovni_clock_now());
ovni_ev_jumbo_emit(&ev, buf, size); ovni_ev_jumbo_emit(&ev, buf, size);
} }

2
test/ovni-driver.sh
View File

@ -2,7 +2,7 @@
# Copyright (c) 2021 Barcelona Supercomputing Center (BSC) # Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
set -e set -ex
if [ -n "$OVNI_TEST_VERBOSE" ]; then if [ -n "$OVNI_TEST_VERBOSE" ]; then
set -x set -x

4
test/rt/CMakeLists.txt
View File

@ -2,5 +2,5 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
add_subdirectory(nanos6) add_subdirectory(nanos6)
add_subdirectory(nodes) #add_subdirectory(nodes)
add_subdirectory(nosv) #add_subdirectory(nosv)