--- ray/resources/cmake_tests/test_pcond.cmake	2017/12/04 21:58:10	1.1
+++ ray/resources/cmake_tests/test_pcond.cmake	2018/01/08 16:51:31	1.2
@@ -1,20 +1,18 @@
 include(setup_paths.cmake)
 
 execute_process(
-  WORKING_DIRECTORY ${office_dir}
-  COMMAND rpict${CMAKE_EXECUTABLE_SUFFIX} -ab 0 -vf model.vp test/raytest_model.oct
-  OUTPUT_FILE test/raytest_rpict.hdr
-  COMMAND pcond${CMAKE_EXECUTABLE_SUFFIX} -h test/raytest_rpict.hdr
-  OUTPUT_FILE test/raytest_rpict_pcd.hdr
+  WORKING_DIRECTORY ${test_output_dir}
+  COMMAND pcond${CMAKE_EXECUTABLE_SUFFIX} -h rpict_out.hdr
+  OUTPUT_FILE pcond_out.hdr
   RESULT_VARIABLE res
 )
 if(NOT ${res} EQUAL 0)
   message(FATAL_ERROR "Bad return value from pcond, res = ${res}")
 endif()
 
-file(READ ${office_dir}/test/raytest_rpict_pcd.hdr test_output)
+file(READ ${test_output_dir}/pcond_out.hdr test_output)
 if(test_output MATCHES "pcond")
   message(STATUS "passed")
 else()
   message(STATUS "failed")
-endif()
\ No newline at end of file
+endif()