--- ray/resources/cmake_tests/test_setup.cmake	2017/12/04 21:58:10	1.1
+++ ray/resources/cmake_tests/test_setup.cmake	2018/01/08 16:51:31	1.2
@@ -1,30 +1,14 @@
-include(setup_paths.cmake) # configured file found in the same dir as this file
+include(setup_paths.cmake)
 
 file(REMOVE_RECURSE ${test_output_dir})
 file(MAKE_DIRECTORY ${test_output_dir})
 
-message("Run: [oconv${CMAKE_EXECUTABLE_SUFFIX} model.b90 desk misc]")
 execute_process(
-  COMMAND oconv${CMAKE_EXECUTABLE_SUFFIX} model.b90 desk misc
-  WORKING_DIRECTORY ${office_dir}
-  OUTPUT_FILE test/raytest_modelb.oct
+  WORKING_DIRECTORY ${test_output_dir}
+  COMMAND oconv${CMAKE_EXECUTABLE_SUFFIX} -f ${resources_dir}/cornell_box/cornell.rad
+  OUTPUT_FILE cornell_box.oct
   RESULT_VARIABLE res
 )
-if(NOT ${res} EQUAL 0)
-  message(FATAL_ERROR "Bad return value from oconv, res = ${res}")
-endif()
-
-message("Run:
-  [oconv${CMAKE_EXECUTABLE_SUFFIX} -f -i test/raytest_modelb.oct
-  window blinds lights lamp picture]")
-execute_process(
-  COMMAND oconv${CMAKE_EXECUTABLE_SUFFIX}
-  -f -i test/raytest_modelb.oct window blinds lights lamp picture
-  WORKING_DIRECTORY ${office_dir}
-  OUTPUT_FILE test/raytest_model.oct
-  RESULT_VARIABLE res
-)
-
 if(NOT ${res} EQUAL 0)
   message(FATAL_ERROR "Bad return value from oconv, res = ${res}")
 endif()