@@ -11,7 +11,7 @@ set(RING_GAP_COMMON_ARGS "--datpath ${CMAKE_CURRENT_SOURCE_DIR}/ring_gap ${COMMO
1111set (PERMUTE1_ARGS "--cell-permute 1" )
1212set (PERMUTE2_ARGS "--cell-permute 2" )
1313if (CORENRN_ENABLE_GPU)
14- set (GPU_ARGS "--nwarp 8 -- gpu" )
14+ set (GPU_ARGS "--gpu" )
1515endif ()
1616
1717# List of tests with arguments
@@ -32,7 +32,8 @@ set(TEST_CASES_WITH_ARGS
3232
3333set (NEGATIVE_TEST_CASES_WITH_ARGS "ring_different_seed!${RING_COMMON_ARGS} ${GPU_ARGS} --outpath ${CMAKE_CURRENT_BINARY_DIR} /ring_different_seed --seed 123456" )
3434
35- # There are no directories for permute and multisend related tests, create them and copy ref spikes
35+ # There are no directories for permute and multisend related tests,
36+ # create them and copy ref spikes
3637foreach (data_dir "ring" "ring_gap" )
3738 foreach (test_suffix
3839 "multisend"
@@ -45,19 +46,26 @@ foreach(data_dir "ring" "ring_gap")
4546 file (COPY
4647 "${CMAKE_CURRENT_SOURCE_DIR} /${data_dir} /out.dat.ref"
4748 DESTINATION
48- "${CMAKE_CURRENT_SOURCE_DIR } /${data_dir} _${test_suffix} /" )
49+ "${CMAKE_CURRENT_BINARY_DIR } /${data_dir} _${test_suffix} /" )
4950 endforeach ()
5051endforeach ()
5152
53+ # base tests : ring, ring with gap and ring duplication
54+ foreach (data_dir "ring" "ring_gap" "ring_duplicate" )
55+ file (COPY
56+ "${CMAKE_CURRENT_SOURCE_DIR} /${data_dir} /out.dat.ref"
57+ DESTINATION
58+ "${CMAKE_CURRENT_BINARY_DIR} /${data_dir} /" )
59+ endforeach ()
60+
61+ # test for small spike buffer
5262file (COPY
5363 "${CMAKE_CURRENT_SOURCE_DIR} /ring/out.dat.ref"
5464 DESTINATION
55- "${CMAKE_CURRENT_SOURCE_DIR} /ring_spike_buffer/" )
56-
57- file (GLOB INPUT_FILES "${CMAKE_CURRENT_SOURCE_DIR} /ring/*.dat" )
65+ "${CMAKE_CURRENT_BINARY_DIR} /ring_spike_buffer/" )
5866
5967# Configure test scripts
60- foreach (args_line ${TEST_CASES_WITH_ARGS } )
68+ foreach (args_line ${TEST_CASES } )
6169 string (REPLACE "!"
6270 ";"
6371 string_line
@@ -77,7 +85,7 @@ foreach(args_line ${TEST_CASES_WITH_ARGS})
7785 WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR} /${TEST_NAME} " )
7886endforeach ()
7987
80- foreach (args_line ${NEGATIVE_TEST_CASES_WITH_ARGS } )
88+ foreach (args_line ${NEGATIVE_TEST_CASES } )
8189 string (REPLACE "!"
8290 ";"
8391 string_line
0 commit comments