Skip to content

Commit 2115b21

Browse files
ubaidskubaidsk
committed
TEST: Revert JIT changes to CMakelists.txt
1 parent 69b826e commit 2115b21

File tree

1 file changed

+5
-36
lines changed

1 file changed

+5
-36
lines changed

‎integration_tests/CMakeLists.txt‎

Lines changed: 5 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,8 @@ 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_NOMOD RUN_EXTRA_ARGS RUN_COPY_TO_BIN RUN_SKIP_ON_JIT)
79+
macro(RUN_UTIL RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOMOD RUN_EXTRA_ARGS RUN_COPY_TO_BIN)
8080
set(fail ${${RUN_FAIL}})
81-
set(skip_jit ${${RUN_SKIP_ON_JIT}})
8281
set(name ${${RUN_NAME}})
8382
set(file_name ${${RUN_FILE_NAME}})
8483
set(labels ${${RUN_LABELS}})
@@ -102,21 +101,11 @@ macro(RUN_UTIL RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOM
102101
set_target_properties(${name} PROPERTIES LINKER_LANGUAGE C)
103102
target_link_libraries(${name} lpython_rtlib)
104103
add_test(${name} ${CMAKE_CURRENT_BINARY_DIR}/${name})
105-
add_test(
106-
NAME "${name}_jit"
107-
COMMAND ${LPYTHON} --jit ${extra_args} ${CMAKE_CURRENT_SOURCE_DIR}/${file_name}.py)
108104
if (labels)
109105
set_tests_properties(${name} PROPERTIES LABELS "${labels}")
110-
set_tests_properties("${name}_jit" PROPERTIES LABELS "${labels}")
111106
endif()
112107
if (${fail})
113108
set_tests_properties(${name} PROPERTIES WILL_FAIL TRUE)
114-
set_tests_properties("${name}_jit" PROPERTIES WILL_FAIL TRUE)
115-
endif()
116-
if (${skip_jit})
117-
set_tests_properties("${name}_jit" PROPERTIES SKIP_RETURN_CODE ${skip_jit})
118-
elseif (DEFINED ${RUN_EXTRAFILES} AND NOT ${RUN_FAIL})
119-
set_tests_properties("${name}_jit" PROPERTIES SKIP_RETURN_CODE 1)
120109
endif()
121110
elseif (KIND STREQUAL "llvm_py")
122111
add_custom_command(
@@ -129,21 +118,11 @@ macro(RUN_UTIL RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOM
129118
set_target_properties(${name} PROPERTIES LINKER_LANGUAGE C)
130119
target_link_libraries(${name} lpython_rtlib Python::Python)
131120
add_test(${name} ${CMAKE_CURRENT_BINARY_DIR}/${name})
132-
add_test(
133-
NAME "${name}_jit"
134-
COMMAND ${LPYTHON} --jit ${extra_args} ${CMAKE_CURRENT_SOURCE_DIR}/${file_name}.py)
135121
if (labels)
136122
set_tests_properties(${name} PROPERTIES LABELS "${labels}")
137-
set_tests_properties("${name}_jit" PROPERTIES LABELS "${labels}")
138123
endif()
139124
if (${fail})
140125
set_tests_properties(${name} PROPERTIES WILL_FAIL TRUE)
141-
set_tests_properties("${name}_jit" PROPERTIES WILL_FAIL TRUE)
142-
endif()
143-
if (${skip_jit})
144-
set_tests_properties("${name}_jit" PROPERTIES SKIP_RETURN_CODE ${skip_jit})
145-
elseif (DEFINED ${RUN_EXTRAFILES} AND NOT ${RUN_FAIL})
146-
set_tests_properties("${name}_jit" PROPERTIES SKIP_RETURN_CODE 1)
147126
endif()
148127
elseif(KIND STREQUAL "llvm_sym")
149128
add_custom_command(
@@ -160,21 +139,11 @@ macro(RUN_UTIL RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOM
160139
endif()
161140
target_link_libraries(${name} lpython_rtlib ${SYMENGINE_LIB})
162141
add_test(${name} ${CMAKE_CURRENT_BINARY_DIR}/${name})
163-
add_test(
164-
NAME "${name}_jit"
165-
COMMAND ${LPYTHON} --enable-symengine --jit ${extra_args} ${CMAKE_CURRENT_SOURCE_DIR}/${file_name}.py)
166142
if (labels)
167143
set_tests_properties(${name} PROPERTIES LABELS "${labels}")
168-
set_tests_properties("${name}_jit" PROPERTIES LABELS "${labels}")
169144
endif()
170145
if (${fail})
171146
set_tests_properties(${name} PROPERTIES WILL_FAIL TRUE)
172-
set_tests_properties("${name}_jit" PROPERTIES WILL_FAIL TRUE)
173-
endif()
174-
if (${skip_jit})
175-
set_tests_properties("${name}_jit" PROPERTIES SKIP_RETURN_CODE ${skip_jit})
176-
elseif (DEFINED ${RUN_EXTRAFILES} AND NOT ${RUN_FAIL})
177-
set_tests_properties("${name}_jit" PROPERTIES SKIP_RETURN_CODE 1)
178147
endif()
179148
elseif(KIND STREQUAL "c")
180149
add_custom_command(
@@ -343,7 +312,7 @@ endmacro(RUN_UTIL)
343312

344313
macro(RUN)
345314
set(options FAIL NOFAST NOMOD ENABLE_CPYTHON LINK_NUMPY NO_WARNINGS)
346-
set(oneValueArgs NAME IMPORT_PATH COPY_TO_BIN REQ_PY_VER SKIP_ON_JIT)
315+
set(oneValueArgs NAME IMPORT_PATH COPY_TO_BIN REQ_PY_VER)
347316
set(multiValueArgs LABELS EXTRAFILES)
348317
cmake_parse_arguments(RUN "${options}" "${oneValueArgs}"
349318
"${multiValueArgs}" ${ARGN} )
@@ -382,14 +351,14 @@ macro(RUN)
382351
endif()
383352

384353
if (NOT FAST)
385-
RUN_UTIL(RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOMOD RUN_EXTRA_ARGS RUN_COPY_TO_BIN RUN_SKIP_ON_JIT)
354+
RUN_UTIL(RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOMOD RUN_EXTRA_ARGS RUN_COPY_TO_BIN)
386355
endif()
387356

388357
if ((FAST) AND (NOT RUN_NOFAST))
389358
set(RUN_EXTRA_ARGS ${RUN_EXTRA_ARGS} --fast)
390359
set(RUN_NAME "${RUN_NAME}_FAST")
391360
list(REMOVE_ITEM RUN_LABELS cpython cpython_sym) # remove cpython, cpython_sym, from --fast test
392-
RUN_UTIL(RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOMOD RUN_EXTRA_ARGS RUN_COPY_TO_BIN RUN_SKIP_ON_JIT)
361+
RUN_UTIL(RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOMOD RUN_EXTRA_ARGS RUN_COPY_TO_BIN)
393362
endif()
394363
endmacro(RUN)
395364

@@ -837,7 +806,7 @@ RUN(NAME comp_01 LABELS cpython llvm c wasm wasm_x64)
837806
RUN(NAME bit_operations_i32 LABELS cpython llvm c wasm wasm_x64)
838807
RUN(NAME bit_operations_i64 LABELS cpython llvm c wasm)
839808

840-
RUN(NAME test_argv_01 LABELS cpython llvm NOFAST SKIP_ON_JIT 1)
809+
RUN(NAME test_argv_01 LABELS cpython llvm NOFAST)
841810
RUN(NAME global_syms_01 LABELS cpython llvm c)
842811
RUN(NAME global_syms_02 LABELS cpython llvm c)
843812
RUN(NAME global_syms_03_b LABELS cpython llvm c)

0 commit comments

Comments
 (0)