Skip to content

Commit 0c116cf

Browse files
committed
Add NOMOD to the testsuite
This is needed in order to use the .emulation dict in lpython.CTypes.
1 parent d308d49 commit 0c116cf

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

integration_tests/CMakeLists.txt

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,13 @@ message("LPYTHON_RTLIB_DIR: ${LPYTHON_RTLIB_DIR}")
7676
message("LPYTHON_RTLIB_LIBRARY: ${LPYTHON_RTLIB_LIBRARY}")
7777

7878

79-
macro(RUN_UTIL RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_EXTRA_ARGS)
79+
macro(RUN_UTIL RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOMOD RUN_EXTRA_ARGS)
8080
set(fail ${${RUN_FAIL}})
8181
set(name ${${RUN_NAME}})
8282
set(file_name ${${RUN_FILE_NAME}})
8383
set(labels ${${RUN_LABELS}})
8484
set(extra_files ${${RUN_EXTRAFILES}})
85+
set(no_mod ${${RUN_NOMOD}})
8586
set(extra_args ${${RUN_EXTRA_ARGS}})
8687

8788
if (NOT name)
@@ -198,8 +199,13 @@ macro(RUN_UTIL RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_EXT
198199
endif()
199200

200201
add_test(${name} python ${CMAKE_CURRENT_SOURCE_DIR}/${file_name}.py)
201-
set_tests_properties(${name} PROPERTIES
202-
ENVIRONMENT "PYTHONPATH=${CMAKE_SOURCE_DIR}/../src/runtime/lpython:${CMAKE_SOURCE_DIR}/..;LPYTHON_PY_MOD_NAME=${PY_MOD};LPYTHON_PY_MOD_PATH=${CMAKE_CURRENT_BINARY_DIR}")
202+
if (no_mod)
203+
set_tests_properties(${name} PROPERTIES
204+
ENVIRONMENT "PYTHONPATH=${CMAKE_SOURCE_DIR}/../src/runtime/lpython:${CMAKE_SOURCE_DIR}/..")
205+
else()
206+
set_tests_properties(${name} PROPERTIES
207+
ENVIRONMENT "PYTHONPATH=${CMAKE_SOURCE_DIR}/../src/runtime/lpython:${CMAKE_SOURCE_DIR}/..;LPYTHON_PY_MOD_NAME=${PY_MOD};LPYTHON_PY_MOD_PATH=${CMAKE_CURRENT_BINARY_DIR}")
208+
endif()
203209
if (labels)
204210
set_tests_properties(${name} PROPERTIES LABELS "${labels}")
205211
endif()
@@ -285,7 +291,7 @@ macro(RUN_UTIL RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_EXT
285291
endmacro(RUN_UTIL)
286292

287293
macro(RUN)
288-
set(options FAIL NOFAST ENABLE_CPYTHON LINK_NUMPY)
294+
set(options FAIL NOFAST NOMOD ENABLE_CPYTHON LINK_NUMPY)
289295
set(oneValueArgs NAME IMPORT_PATH)
290296
set(multiValueArgs LABELS EXTRAFILES)
291297
cmake_parse_arguments(RUN "${options}" "${oneValueArgs}"
@@ -309,14 +315,14 @@ macro(RUN)
309315
endif()
310316

311317
if (NOT FAST)
312-
RUN_UTIL(RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_EXTRA_ARGS)
318+
RUN_UTIL(RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOMOD RUN_EXTRA_ARGS)
313319
endif()
314320

315321
if ((FAST) AND (NOT RUN_NOFAST))
316322
set(RUN_EXTRA_ARGS ${RUN_EXTRA_ARGS} --fast)
317323
set(RUN_NAME "${RUN_NAME}_FAST")
318324
list(REMOVE_ITEM RUN_LABELS cpython cpython_sym) # remove cpython, cpython_sym, from --fast test
319-
RUN_UTIL(RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_EXTRA_ARGS)
325+
RUN_UTIL(RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOMOD RUN_EXTRA_ARGS)
320326
endif()
321327
endmacro(RUN)
322328

@@ -739,4 +745,4 @@ RUN(NAME lpython_decorator_02 LABELS cpython)
739745
COMPILE(NAME import_order_01 LABELS cpython llvm c) # any
740746

741747
# LPython emulation mode
742-
RUN(NAME lpython_emulation_01 LABELS cpython)
748+
RUN(NAME lpython_emulation_01 LABELS cpython NOMOD)

0 commit comments

Comments
 (0)