From: <ai...@us...> - 2008-07-18 01:06:12
|
Revision: 8526 http://plplot.svn.sourceforge.net/plplot/?rev=8526&view=rev Author: airwin Date: 2008-07-18 01:06:20 +0000 (Fri, 18 Jul 2008) Log Message: ----------- Enable ocaml ctest. Note, ocaml bindings don't cope with command line options as yet so you have to hit carriage return to get some action out of this particular ctest. Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2008-07-18 01:00:14 UTC (rev 8525) +++ trunk/plplot_test/CMakeLists.txt 2008-07-18 01:06:20 UTC (rev 8526) @@ -129,11 +129,9 @@ @ONLY ) set(SCRIPTS ${SCRIPTS} test_ocaml.sh) - # Disable test for now - ocaml bindings don't cope with command line options - # so non-interactive tests don't work. - #add_test(examples_ocaml - # ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=ocaml" - #) + add_test(examples_ocaml + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=ocaml" + ) endif(ENABLE_ocaml) # Run C examples with different drivers This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-08-26 02:20:42
|
Revision: 8711 http://plplot.svn.sourceforge.net/plplot/?rev=8711&view=rev Author: airwin Date: 2008-08-26 02:20:52 +0000 (Tue, 26 Aug 2008) Log Message: ----------- Emacs CMake mode indentation. Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2008-08-25 04:30:45 UTC (rev 8710) +++ trunk/plplot_test/CMakeLists.txt 2008-08-26 02:20:52 UTC (rev 8711) @@ -3,258 +3,258 @@ if(SH_EXECUTABLE) -set(TEST_ENVIRONMENT - "EXAMPLES_DIR=${CMAKE_BINARY_DIR}/examples SRC_EXAMPLES_DIR=${CMAKE_SOURCE_DIR}/examples PLPLOT_LIB=${CMAKE_SOURCE_DIR}/data/" -) + set(TEST_ENVIRONMENT + "EXAMPLES_DIR=${CMAKE_BINARY_DIR}/examples SRC_EXAMPLES_DIR=${CMAKE_SOURCE_DIR}/examples PLPLOT_LIB=${CMAKE_SOURCE_DIR}/data/" + ) -set(TEST_DEVICE psc CACHE STRING "device used for ctest") -set(TEST_SCRIPT "./plplot-test.sh --verbose") -set(TEST_SCRIPT_DEVICE "${TEST_SCRIPT} --device=${TEST_DEVICE}") + set(TEST_DEVICE psc CACHE STRING "device used for ctest") + set(TEST_SCRIPT "./plplot-test.sh --verbose") + set(TEST_SCRIPT_DEVICE "${TEST_SCRIPT} --device=${TEST_DEVICE}") -set(JAVA_TEST_ENVIRONMENT "${TEST_ENVIRONMENT} PLPLOT_JAVA_WRAP_DIR=${CMAKE_BINARY_DIR}/bindings/java/ PLPLOT_CLASSPATH=${CMAKE_BINARY_DIR}/examples/java/plplot.jar") + set(JAVA_TEST_ENVIRONMENT "${TEST_ENVIRONMENT} PLPLOT_JAVA_WRAP_DIR=${CMAKE_BINARY_DIR}/bindings/java/ PLPLOT_CLASSPATH=${CMAKE_BINARY_DIR}/examples/java/plplot.jar") -configure_file( - plplot-test.sh.cmake - ${CMAKE_CURRENT_BINARY_DIR}/plplot-test.sh - @ONLY - ) + configure_file( + plplot-test.sh.cmake + ${CMAKE_CURRENT_BINARY_DIR}/plplot-test.sh + @ONLY + ) -configure_file(test_c.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_c.sh @ONLY) -set(SCRIPTS test_c.sh) -add_test(examples_c - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=c" - ) + configure_file(test_c.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_c.sh @ONLY) + set(SCRIPTS test_c.sh) + add_test(examples_c + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=c" + ) -if(ENABLE_cxx) - configure_file(test_cxx.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_cxx.sh @ONLY) - set(SCRIPTS ${SCRIPTS} test_cxx.sh) - add_test(examples_cxx - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=cxx" - ) -endif(ENABLE_cxx) + if(ENABLE_cxx) + configure_file(test_cxx.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_cxx.sh @ONLY) + set(SCRIPTS ${SCRIPTS} test_cxx.sh) + add_test(examples_cxx + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=cxx" + ) + endif(ENABLE_cxx) -if(ENABLE_f77) - configure_file(test_f77.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_f77.sh @ONLY) - set(SCRIPTS ${SCRIPTS} test_f77.sh) - add_test(examples_f77 - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=f77" - ) -endif(ENABLE_f77) + if(ENABLE_f77) + configure_file(test_f77.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_f77.sh @ONLY) + set(SCRIPTS ${SCRIPTS} test_f77.sh) + add_test(examples_f77 + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=f77" + ) + endif(ENABLE_f77) -if(ENABLE_f95) - configure_file(test_f95.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_f95.sh @ONLY) - set(SCRIPTS ${SCRIPTS} test_f95.sh) - add_test(examples_f95 - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=f95" - ) -endif(ENABLE_f95) + if(ENABLE_f95) + configure_file(test_f95.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_f95.sh @ONLY) + set(SCRIPTS ${SCRIPTS} test_f95.sh) + add_test(examples_f95 + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=f95" + ) + endif(ENABLE_f95) -if(ENABLE_java) - configure_file( - test_java.sh.in - ${CMAKE_CURRENT_BINARY_DIR}/test_java.sh - @ONLY - ) - set(SCRIPTS ${SCRIPTS} test_java.sh) - add_test(examples_java - ${SH_EXECUTABLE} -c "${JAVA_TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=java" - ) -endif(ENABLE_java) + if(ENABLE_java) + configure_file( + test_java.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_java.sh + @ONLY + ) + set(SCRIPTS ${SCRIPTS} test_java.sh) + add_test(examples_java + ${SH_EXECUTABLE} -c "${JAVA_TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=java" + ) + endif(ENABLE_java) -if(ENABLE_octave) - configure_file( - test_octave.sh.in - ${CMAKE_CURRENT_BINARY_DIR}/test_octave.sh - @ONLY - ) - set(SCRIPTS ${SCRIPTS} test_octave.sh) - add_test(examples_octave - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=octave" - ) -endif(ENABLE_octave) + if(ENABLE_octave) + configure_file( + test_octave.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_octave.sh + @ONLY + ) + set(SCRIPTS ${SCRIPTS} test_octave.sh) + add_test(examples_octave + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=octave" + ) + endif(ENABLE_octave) -if(ENABLE_python) - if(HAVE_NUMPY) - # The following examples only work with numpy - set(NUMPY_EXAMPLES "21") - else(HAVE_NUMPY) - set(NUMPY_EXAMPLES) - endif(HAVE_NUMPY) - configure_file( - test_python.sh.in - ${CMAKE_CURRENT_BINARY_DIR}/test_python.sh - @ONLY - ) - set(SCRIPTS ${SCRIPTS} test_python.sh) - add_test(examples_python - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=python" - ) -endif(ENABLE_python) + if(ENABLE_python) + if(HAVE_NUMPY) + # The following examples only work with numpy + set(NUMPY_EXAMPLES "21") + else(HAVE_NUMPY) + set(NUMPY_EXAMPLES) + endif(HAVE_NUMPY) + configure_file( + test_python.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_python.sh + @ONLY + ) + set(SCRIPTS ${SCRIPTS} test_python.sh) + add_test(examples_python + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=python" + ) + endif(ENABLE_python) -if(ENABLE_tcl) - configure_file(test_tcl.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_tcl.sh @ONLY) - set(SCRIPTS ${SCRIPTS} test_tcl.sh) - add_test(examples_tcl - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=tcl" - ) -endif(ENABLE_tcl) + if(ENABLE_tcl) + configure_file(test_tcl.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_tcl.sh @ONLY) + set(SCRIPTS ${SCRIPTS} test_tcl.sh) + add_test(examples_tcl + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=tcl" + ) + endif(ENABLE_tcl) -if(ENABLE_pdl) - configure_file( - test_perl.sh.in - ${CMAKE_CURRENT_BINARY_DIR}/test_perl.sh - @ONLY - ) - set(SCRIPTS ${SCRIPTS} test_perl.sh) - add_test(examples_perl - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=perl" - ) -endif(ENABLE_pdl) + if(ENABLE_pdl) + configure_file( + test_perl.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_perl.sh + @ONLY + ) + set(SCRIPTS ${SCRIPTS} test_perl.sh) + add_test(examples_perl + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=perl" + ) + endif(ENABLE_pdl) -if(ENABLE_ada) - configure_file( - test_ada.sh.in - ${CMAKE_CURRENT_BINARY_DIR}/test_ada.sh - @ONLY - ) - set(SCRIPTS ${SCRIPTS} test_ada.sh) - add_test(examples_ada - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ada" - ) -endif(ENABLE_ada) + if(ENABLE_ada) + configure_file( + test_ada.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_ada.sh + @ONLY + ) + set(SCRIPTS ${SCRIPTS} test_ada.sh) + add_test(examples_ada + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ada" + ) + endif(ENABLE_ada) -if(ENABLE_ocaml) - configure_file( - test_ocaml.sh.in - ${CMAKE_CURRENT_BINARY_DIR}/test_ocaml.sh - @ONLY - ) - set(SCRIPTS ${SCRIPTS} test_ocaml.sh) - add_test(examples_ocaml - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ocaml" - ) -endif(ENABLE_ocaml) + if(ENABLE_ocaml) + configure_file( + test_ocaml.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_ocaml.sh + @ONLY + ) + set(SCRIPTS ${SCRIPTS} test_ocaml.sh) + add_test(examples_ocaml + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ocaml" + ) + endif(ENABLE_ocaml) -# Run C examples with different drivers -if(PLD_psc) - if (NOT TEST_DEVICE STREQUAL "psc") - add_test(examples_psttfc - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=psttfc" - ) - endif(NOT TEST_DEVICE STREQUAL "psc") -endif(PLD_psc) + # Run C examples with different drivers + if(PLD_psc) + if (NOT TEST_DEVICE STREQUAL "psc") + add_test(examples_psttfc + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=psttfc" + ) + endif(NOT TEST_DEVICE STREQUAL "psc") + endif(PLD_psc) -if(PLD_psttf) - if (NOT TEST_DEVICE STREQUAL "psttfc") - add_test(examples_psttfc - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=psttfc" - ) - endif(NOT TEST_DEVICE STREQUAL "psttfc") -endif(PLD_psttf) + if(PLD_psttf) + if (NOT TEST_DEVICE STREQUAL "psttfc") + add_test(examples_psttfc + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=psttfc" + ) + endif(NOT TEST_DEVICE STREQUAL "psttfc") + endif(PLD_psttf) -if(PLD_pstex) - if (NOT TEST_DEVICE STREQUAL "pstex") - add_test(examples_pstex - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pstex" - ) - endif(NOT TEST_DEVICE STREQUAL "pstex") -endif(PLD_pstex) + if(PLD_pstex) + if (NOT TEST_DEVICE STREQUAL "pstex") + add_test(examples_pstex + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pstex" + ) + endif(NOT TEST_DEVICE STREQUAL "pstex") + endif(PLD_pstex) -if(PLD_png) - if (NOT TEST_DEVICE STREQUAL "png") - add_test(examples_png - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=png" - ) - endif(NOT TEST_DEVICE STREQUAL "png") -endif(PLD_png) + if(PLD_png) + if (NOT TEST_DEVICE STREQUAL "png") + add_test(examples_png + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=png" + ) + endif(NOT TEST_DEVICE STREQUAL "png") + endif(PLD_png) -if(PLD_svg) - if (NOT TEST_DEVICE STREQUAL "svg") - add_test(examples_svg - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=svg" - ) - endif(NOT TEST_DEVICE STREQUAL "svg") -endif(PLD_svg) + if(PLD_svg) + if (NOT TEST_DEVICE STREQUAL "svg") + add_test(examples_svg + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=svg" + ) + endif(NOT TEST_DEVICE STREQUAL "svg") + endif(PLD_svg) -if(PLD_plmeta) - if (NOT TEST_DEVICE STREQUAL "plmeta") - add_test(examples_plmeta - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=plmeta" - ) - endif(NOT TEST_DEVICE STREQUAL "plmeta") -endif(PLD_plmeta) + if(PLD_plmeta) + if (NOT TEST_DEVICE STREQUAL "plmeta") + add_test(examples_plmeta + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=plmeta" + ) + endif(NOT TEST_DEVICE STREQUAL "plmeta") + endif(PLD_plmeta) -if(PLD_pscairo) - if (NOT TEST_DEVICE STREQUAL "pscairo") - add_test(examples_pscairo - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pscairo" - ) - endif(NOT TEST_DEVICE STREQUAL "pscairo") -endif(PLD_pscairo) + if(PLD_pscairo) + if (NOT TEST_DEVICE STREQUAL "pscairo") + add_test(examples_pscairo + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pscairo" + ) + endif(NOT TEST_DEVICE STREQUAL "pscairo") + endif(PLD_pscairo) -if(PLD_pngcairo) - if (NOT TEST_DEVICE STREQUAL "pngcairo") - add_test(examples_pngcairo - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pngcairo" - ) - endif(NOT TEST_DEVICE STREQUAL "pngcairo") -endif(PLD_pngcairo) + if(PLD_pngcairo) + if (NOT TEST_DEVICE STREQUAL "pngcairo") + add_test(examples_pngcairo + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pngcairo" + ) + endif(NOT TEST_DEVICE STREQUAL "pngcairo") + endif(PLD_pngcairo) -if(DIFF_EXECUTABLE AND TAIL_EXECUTABLE) -configure_file(test_diff.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_diff.sh @ONLY) -set(SCRIPTS test_diff.sh) -add_test(examples_compare - ${SH_EXECUTABLE} -c "./test_diff.sh" -) -endif(DIFF_EXECUTABLE AND TAIL_EXECUTABLE) + if(DIFF_EXECUTABLE AND TAIL_EXECUTABLE) + configure_file(test_diff.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_diff.sh @ONLY) + set(SCRIPTS test_diff.sh) + add_test(examples_compare + ${SH_EXECUTABLE} -c "./test_diff.sh" + ) + endif(DIFF_EXECUTABLE AND TAIL_EXECUTABLE) -# Make a copy of lena.pgm to the test subdirectory of the build -# tree so that example 20 will run from there. -# Also need a copy of lena.img for the octave bindings -if(BUILD_TEST) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm - COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_SOURCE_DIR}/examples/lena.pgm - ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm - DEPENDS ${CMAKE_SOURCE_DIR}/examples/lena.pgm - ) - add_custom_target(lena_file ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm) - if(ENABLE_octave) + # Make a copy of lena.pgm to the test subdirectory of the build + # tree so that example 20 will run from there. + # Also need a copy of lena.img for the octave bindings + if(BUILD_TEST) add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lena.img + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_SOURCE_DIR}/bindings/octave/demos/lena.img - ${CMAKE_CURRENT_BINARY_DIR}/lena.img - DEPENDS ${CMAKE_SOURCE_DIR}/bindings/octave/demos/lena.img + ${CMAKE_SOURCE_DIR}/examples/lena.pgm + ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm + DEPENDS ${CMAKE_SOURCE_DIR}/examples/lena.pgm + ) + add_custom_target(lena_file ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm) + if(ENABLE_octave) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lena.img + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_SOURCE_DIR}/bindings/octave/demos/lena.img + ${CMAKE_CURRENT_BINARY_DIR}/lena.img + DEPENDS ${CMAKE_SOURCE_DIR}/bindings/octave/demos/lena.img + ) + add_custom_target(lena_octave_file ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/lena.img) + endif(ENABLE_octave) + endif(BUILD_TEST) + + set(PERM_SCRIPTS + OWNER_READ + OWNER_WRITE + OWNER_EXECUTE + GROUP_READ + GROUP_EXECUTE + WORLD_READ + WORLD_EXECUTE ) - add_custom_target(lena_octave_file ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/lena.img) - endif(ENABLE_octave) -endif(BUILD_TEST) -set(PERM_SCRIPTS -OWNER_READ -OWNER_WRITE -OWNER_EXECUTE -GROUP_READ -GROUP_EXECUTE -WORLD_READ -WORLD_EXECUTE -) + foreach(SCRIPT ${SCRIPTS}) + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPT} + DESTINATION ${DATA_DIR}/examples + PERMISSIONS ${PERM_SCRIPTS} + ) + endforeach(SCRIPT ${SCRIPTS}) -foreach(SCRIPT ${SCRIPTS}) install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPT} - DESTINATION ${DATA_DIR}/examples - PERMISSIONS ${PERM_SCRIPTS} - ) -endforeach(SCRIPT ${SCRIPTS}) + FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot-test.sh + DESTINATION ${DATA_DIR}/examples + PERMISSIONS ${PERM_SCRIPTS} + ) -install( -FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot-test.sh -DESTINATION ${DATA_DIR}/examples -PERMISSIONS ${PERM_SCRIPTS} -) - endif(SH_EXECUTABLE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-07-10 21:24:04
|
Revision: 10138 http://plplot.svn.sourceforge.net/plplot/?rev=10138&view=rev Author: airwin Date: 2009-07-10 21:23:59 +0000 (Fri, 10 Jul 2009) Log Message: ----------- Revision 10136 has already properly informed the PLplot library of the source-tree location of fonts, map files, and palette files for the case when a build is being done in the build tree. Therefore, remove PLPLOT_LIB from TEST_ENVIRONMENT since this is no longer necessary. Revision Links: -------------- http://plplot.svn.sourceforge.net/plplot/?rev=10136&view=rev Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2009-07-10 19:58:03 UTC (rev 10137) +++ trunk/plplot_test/CMakeLists.txt 2009-07-10 21:23:59 UTC (rev 10138) @@ -4,7 +4,7 @@ if(SH_EXECUTABLE) set(SCRIPTS) set(TEST_ENVIRONMENT - "EXAMPLES_DIR=${CMAKE_BINARY_DIR}/examples SRC_EXAMPLES_DIR=${CMAKE_SOURCE_DIR}/examples PLPLOT_LIB=${CMAKE_SOURCE_DIR}/data/" + "EXAMPLES_DIR=${CMAKE_BINARY_DIR}/examples SRC_EXAMPLES_DIR=${CMAKE_SOURCE_DIR}/examples" ) set(TEST_DEVICE psc CACHE STRING "device used for ctest") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sm...@us...> - 2009-08-24 14:49:11
|
Revision: 10322 http://plplot.svn.sourceforge.net/plplot/?rev=10322&view=rev Author: smekal Date: 2009-08-24 14:49:03 +0000 (Mon, 24 Aug 2009) Log Message: ----------- Added pdf driver to the test routines. Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2009-08-24 14:31:13 UTC (rev 10321) +++ trunk/plplot_test/CMakeLists.txt 2009-08-24 14:49:03 UTC (rev 10322) @@ -311,6 +311,12 @@ ) endif(PLD_pdfqt) + if(PLD_pdf) + add_test(examples_pdf + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pdf" + ) + endif(PLD_pdf) + if(DIFF_EXECUTABLE AND TAIL_EXECUTABLE) configure_file( test_diff.sh.in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-12-13 18:27:46
|
Revision: 12863 http://sourceforge.net/p/plplot/code/12863 Author: airwin Date: 2013-12-13 18:27:43 +0000 (Fri, 13 Dec 2013) Log Message: ----------- Reinstate all tests again. Fixed some bogus logic I recently introduced concerning PLD_psc (which of course does not exist and PLD_ps should be used instead). Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2013-12-13 10:18:08 UTC (rev 12862) +++ trunk/plplot_test/CMakeLists.txt 2013-12-13 18:27:43 UTC (rev 12863) @@ -29,6 +29,19 @@ ) set(TEST_DEVICE psc CACHE STRING "device used for ctest") + # There is no PLD_psc or PLD_psttfc and the PLD_ps and PLD_psttf + # variables must be used instead. All other PLD_* names correspond + # to exact device names. So adjust for this complicated naming + # scheme in a general way in case some other TEST_DEVICE is chosen + # in the future. + if(TEST_DEVICE STREQUAL "psc") + set(PLD_TEST_DEVICE ${PLD_ps}) + elseif(TEST_DEVICE STREQUAL "psttfc") + set(PLD_TEST_DEVICE ${PLD_psttf}) + else(TEST_DEVICE STREQUAL "psc") + set(PLD_TEST_DEVICE ${PLD_${TEST_DEVICE}}) + endif(TEST_DEVICE STREQUAL "psc") + set(TEST_SCRIPT "./plplot-test.sh --verbose") set(TEST_SCRIPT_DEVICE "${TEST_SCRIPT} --device=${TEST_DEVICE}") @@ -97,14 +110,14 @@ set(test_output_files_LIST) set(examples_compare_DEPENDS) - if(PLD_${TEST_DEVICE}) + if(PLD_TEST_DEVICE) add_test(examples_c ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=c" ) list(APPEND examples_compare_DEPENDS examples_c) list_example_files(. ${TEST_DEVICE} c output_list) list(APPEND test_output_files_LIST ${output_list}) - endif(PLD_${TEST_DEVICE}) + endif(PLD_TEST_DEVICE) if(ENABLE_cxx) configure_file( @@ -113,14 +126,14 @@ @ONLY ) list(APPEND SCRIPTS test_cxx.sh) - if(PLD_${TEST_DEVICE}) + if(PLD_TEST_DEVICE) add_test(examples_cxx ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=cxx" ) list(APPEND examples_compare_DEPENDS examples_cxx) list_example_files(. ${TEST_DEVICE} cxx output_list) list(APPEND test_output_files_LIST ${output_list}) - endif(PLD_${TEST_DEVICE}) + endif(PLD_TEST_DEVICE) endif(ENABLE_cxx) if(ENABLE_f95) @@ -130,14 +143,14 @@ @ONLY ) list(APPEND SCRIPTS test_f95.sh) - if(PLD_${TEST_DEVICE}) + if(PLD_TEST_DEVICE) add_test(examples_f95 ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=f95" ) list(APPEND examples_compare_DEPENDS examples_f95) list_example_files(. ${TEST_DEVICE} f95 output_list) list(APPEND test_output_files_LIST ${output_list}) - endif(PLD_${TEST_DEVICE}) + endif(PLD_TEST_DEVICE) endif(ENABLE_f95) if(ENABLE_java) @@ -147,14 +160,14 @@ @ONLY ) list(APPEND SCRIPTS test_java.sh) - if(PLD_${TEST_DEVICE}) + if(PLD_TEST_DEVICE) add_test(examples_java ${SH_EXECUTABLE} -c "${JAVA_TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=java" ) list(APPEND examples_compare_DEPENDS examples_java) list_example_files(. ${TEST_DEVICE} j output_list) list(APPEND test_output_files_LIST ${output_list}) - endif(PLD_${TEST_DEVICE}) + endif(PLD_TEST_DEVICE) endif(ENABLE_java) if(ENABLE_octave) @@ -172,14 +185,14 @@ @ONLY ) list(APPEND SCRIPTS test_octave.sh) - if(PLD_${TEST_DEVICE}) + if(PLD_TEST_DEVICE) add_test(examples_octave ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=octave" ) list(APPEND examples_compare_DEPENDS examples_octave) list_example_files(. ${TEST_DEVICE} o output_list) list(APPEND test_output_files_LIST ${output_list}) - endif(PLD_${TEST_DEVICE}) + endif(PLD_TEST_DEVICE) endif(ENABLE_octave) if(ENABLE_python) @@ -189,14 +202,14 @@ @ONLY ) list(APPEND SCRIPTS test_python.sh) - if(PLD_${TEST_DEVICE}) + if(PLD_TEST_DEVICE) add_test(examples_python ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=python" ) list(APPEND examples_compare_DEPENDS examples_python) list_example_files(. ${TEST_DEVICE} p output_list) list(APPEND test_output_files_LIST ${output_list}) - endif(PLD_${TEST_DEVICE}) + endif(PLD_TEST_DEVICE) endif(ENABLE_python) if(ENABLE_tcl) @@ -215,14 +228,14 @@ ${CMAKE_CURRENT_BINARY_DIR}/test_tcl.sh @ONLY ) - if(PLD_${TEST_DEVICE}) + if(PLD_TEST_DEVICE) add_test(examples_tcl ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=tcl" ) list(APPEND examples_compare_DEPENDS examples_tcl) list_example_files(. ${TEST_DEVICE} t output_list) list(APPEND test_output_files_LIST ${output_list}) - endif(PLD_${TEST_DEVICE}) + endif(PLD_TEST_DEVICE) set(PLTCL_DIR ${BIN_DIR}) # Transform drive-letter form to leading-slash form, see comment above. string(REGEX REPLACE "^(.):" "/\\1/" PLTCL_DIR ${PLTCL_DIR}) @@ -240,14 +253,14 @@ @ONLY ) list(APPEND SCRIPTS test_pdl.sh) - if(PLD_${TEST_DEVICE}) + if(PLD_TEST_DEVICE) add_test(examples_pdl ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=pdl" ) list(APPEND examples_compare_DEPENDS examples_pdl) list_example_files(. ${TEST_DEVICE} pdl output_list) list(APPEND test_output_files_LIST ${output_list}) - endif(PLD_${TEST_DEVICE}) + endif(PLD_TEST_DEVICE) endif(ENABLE_pdl) if(ENABLE_ada) @@ -257,14 +270,14 @@ @ONLY ) list(APPEND SCRIPTS test_ada.sh) - if(PLD_${TEST_DEVICE}) + if(PLD_TEST_DEVICE) add_test(examples_ada ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ada" ) list(APPEND examples_compare_DEPENDS examples_ada) list_example_files(. ${TEST_DEVICE} a output_list) list(APPEND test_output_files_LIST ${output_list}) - endif(PLD_${TEST_DEVICE}) + endif(PLD_TEST_DEVICE) endif(ENABLE_ada) if(ENABLE_ocaml) @@ -274,14 +287,14 @@ @ONLY ) list(APPEND SCRIPTS test_ocaml.sh) - if(PLD_${TEST_DEVICE}) + if(PLD_TEST_DEVICE) add_test(examples_ocaml ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ocaml" ) list(APPEND examples_compare_DEPENDS examples_ocaml) list_example_files(. ${TEST_DEVICE} ocaml output_list) list(APPEND test_output_files_LIST ${output_list}) - endif(PLD_${TEST_DEVICE}) + endif(PLD_TEST_DEVICE) endif(ENABLE_ocaml) if(ENABLE_lua) @@ -291,14 +304,14 @@ @ONLY ) list(APPEND SCRIPTS test_lua.sh) - if(PLD_${TEST_DEVICE}) + if(PLD_TEST_DEVICE) add_test(examples_lua ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=lua" ) list(APPEND examples_compare_DEPENDS examples_lua) list_example_files(. ${TEST_DEVICE} lua output_list) list(APPEND test_output_files_LIST ${output_list}) - endif(PLD_${TEST_DEVICE}) + endif(PLD_TEST_DEVICE) endif(ENABLE_lua) if(ENABLE_d) @@ -308,18 +321,18 @@ @ONLY ) list(APPEND SCRIPTS test_d.sh) - if(PLD_${TEST_DEVICE}) + if(PLD_TEST_DEVICE) add_test(examples_d ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=d" ) list(APPEND examples_compare_DEPENDS examples_d) list_example_files(. ${TEST_DEVICE} d output_list) list(APPEND test_output_files_LIST ${output_list}) - endif(PLD_${TEST_DEVICE}) + endif(PLD_TEST_DEVICE) endif(ENABLE_d) # Run C examples with different drivers - if(PLD_psc) + if(PLD_ps) if (NOT TEST_DEVICE STREQUAL "psc") add_test(examples_psc ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=psc" @@ -327,7 +340,7 @@ list_example_files(. psc c output_list) list(APPEND test_output_files_LIST ${output_list}) endif(NOT TEST_DEVICE STREQUAL "psc") - endif(PLD_psc) + endif(PLD_ps) if(PLD_psttf) add_test(examples_psttfc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-12-19 20:56:29
|
Revision: 12891 http://sourceforge.net/p/plplot/code/12891 Author: airwin Date: 2013-12-19 20:56:26 +0000 (Thu, 19 Dec 2013) Log Message: ----------- Replace cmake -E copy with more appropriate cmake -E copy_if_different. Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2013-12-19 20:45:09 UTC (rev 12890) +++ trunk/plplot_test/CMakeLists.txt 2013-12-19 20:56:26 UTC (rev 12891) @@ -521,7 +521,7 @@ # tree so that example 20 will run from there. add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm - COMMAND ${CMAKE_COMMAND} -E copy + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/examples/lena.pgm ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm DEPENDS ${CMAKE_SOURCE_DIR}/examples/lena.pgm @@ -531,7 +531,7 @@ # Also need a copy of lena.img for the octave bindings add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lena.img - COMMAND ${CMAKE_COMMAND} -E copy + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/examples/octave/lena.img ${CMAKE_CURRENT_BINARY_DIR}/lena.img DEPENDS ${CMAKE_SOURCE_DIR}/examples/octave/lena.img This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-08-26 02:37:41
|
Revision: 8712 http://plplot.svn.sourceforge.net/plplot/?rev=8712&view=rev Author: airwin Date: 2008-08-26 02:37:51 +0000 (Tue, 26 Aug 2008) Log Message: ----------- Fix bug in generation of SCRIPTS list where only test_diff.sh was appearing on the list (and therefore the only test*.sh file that was installed. Also change style to use the list command to generate this list. Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2008-08-26 02:20:52 UTC (rev 8711) +++ trunk/plplot_test/CMakeLists.txt 2008-08-26 02:37:51 UTC (rev 8712) @@ -2,7 +2,7 @@ # a shell is available. if(SH_EXECUTABLE) - + set(SCRIPTS) set(TEST_ENVIRONMENT "EXAMPLES_DIR=${CMAKE_BINARY_DIR}/examples SRC_EXAMPLES_DIR=${CMAKE_SOURCE_DIR}/examples PLPLOT_LIB=${CMAKE_SOURCE_DIR}/data/" ) @@ -20,14 +20,14 @@ ) configure_file(test_c.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_c.sh @ONLY) - set(SCRIPTS test_c.sh) + list(APPEND SCRIPTS test_c.sh) add_test(examples_c ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=c" ) if(ENABLE_cxx) configure_file(test_cxx.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_cxx.sh @ONLY) - set(SCRIPTS ${SCRIPTS} test_cxx.sh) + list(APPEND SCRIPTS test_cxx.sh) add_test(examples_cxx ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=cxx" ) @@ -35,7 +35,7 @@ if(ENABLE_f77) configure_file(test_f77.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_f77.sh @ONLY) - set(SCRIPTS ${SCRIPTS} test_f77.sh) + list(APPEND SCRIPTS test_f77.sh) add_test(examples_f77 ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=f77" ) @@ -43,7 +43,7 @@ if(ENABLE_f95) configure_file(test_f95.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_f95.sh @ONLY) - set(SCRIPTS ${SCRIPTS} test_f95.sh) + list(APPEND SCRIPTS test_f95.sh) add_test(examples_f95 ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=f95" ) @@ -55,7 +55,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/test_java.sh @ONLY ) - set(SCRIPTS ${SCRIPTS} test_java.sh) + list(APPEND SCRIPTS test_java.sh) add_test(examples_java ${SH_EXECUTABLE} -c "${JAVA_TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=java" ) @@ -67,7 +67,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/test_octave.sh @ONLY ) - set(SCRIPTS ${SCRIPTS} test_octave.sh) + list(APPEND SCRIPTS test_octave.sh) add_test(examples_octave ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=octave" ) @@ -85,7 +85,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/test_python.sh @ONLY ) - set(SCRIPTS ${SCRIPTS} test_python.sh) + list(APPEND SCRIPTS test_python.sh) add_test(examples_python ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=python" ) @@ -93,7 +93,7 @@ if(ENABLE_tcl) configure_file(test_tcl.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_tcl.sh @ONLY) - set(SCRIPTS ${SCRIPTS} test_tcl.sh) + list(APPEND SCRIPTS test_tcl.sh) add_test(examples_tcl ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=tcl" ) @@ -105,7 +105,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/test_perl.sh @ONLY ) - set(SCRIPTS ${SCRIPTS} test_perl.sh) + list(APPEND SCRIPTS test_perl.sh) add_test(examples_perl ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=perl" ) @@ -117,7 +117,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/test_ada.sh @ONLY ) - set(SCRIPTS ${SCRIPTS} test_ada.sh) + list(APPEND SCRIPTS test_ada.sh) add_test(examples_ada ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ada" ) @@ -129,7 +129,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/test_ocaml.sh @ONLY ) - set(SCRIPTS ${SCRIPTS} test_ocaml.sh) + list(APPEND SCRIPTS test_ocaml.sh) add_test(examples_ocaml ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ocaml" ) @@ -202,7 +202,7 @@ if(DIFF_EXECUTABLE AND TAIL_EXECUTABLE) configure_file(test_diff.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_diff.sh @ONLY) - set(SCRIPTS test_diff.sh) + list(APPEND SCRIPTS test_diff.sh) add_test(examples_compare ${SH_EXECUTABLE} -c "./test_diff.sh" ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-12-10 01:00:18
|
Revision: 9063 http://plplot.svn.sourceforge.net/plplot/?rev=9063&view=rev Author: airwin Date: 2008-12-10 01:00:14 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Configure and install plplot-test-interactive.sh Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2008-12-10 00:53:55 UTC (rev 9062) +++ trunk/plplot_test/CMakeLists.txt 2008-12-10 01:00:14 UTC (rev 9063) @@ -19,6 +19,12 @@ @ONLY ) + configure_file( + plplot-test-interactive.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/plplot-test-interactive.sh + @ONLY + ) + configure_file(test_c.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_c.sh @ONLY) list(APPEND SCRIPTS test_c.sh) add_test(examples_c @@ -257,4 +263,10 @@ PERMISSIONS ${PERM_SCRIPTS} ) + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot-test-interactive.sh + DESTINATION ${DATA_DIR}/examples + PERMISSIONS ${PERM_SCRIPTS} + ) + endif(SH_EXECUTABLE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-12-14 05:56:12
|
Revision: 9098 http://plplot.svn.sourceforge.net/plplot/?rev=9098&view=rev Author: airwin Date: 2008-12-14 05:56:09 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Whitespace. Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2008-12-14 05:52:23 UTC (rev 9097) +++ trunk/plplot_test/CMakeLists.txt 2008-12-14 05:56:09 UTC (rev 9098) @@ -15,24 +15,32 @@ configure_file( plplot-test.sh.cmake - ${CMAKE_CURRENT_BINARY_DIR}/plplot-test.sh + ${CMAKE_CURRENT_BINARY_DIR}/plplot-test.sh @ONLY ) configure_file( plplot-test-interactive.sh.in - ${CMAKE_CURRENT_BINARY_DIR}/plplot-test-interactive.sh + ${CMAKE_CURRENT_BINARY_DIR}/plplot-test-interactive.sh @ONLY ) - configure_file(test_c.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_c.sh @ONLY) + configure_file( + test_c.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_c.sh + @ONLY + ) list(APPEND SCRIPTS test_c.sh) add_test(examples_c ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=c" ) if(ENABLE_cxx) - configure_file(test_cxx.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_cxx.sh @ONLY) + configure_file( + test_cxx.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_cxx.sh + @ONLY + ) list(APPEND SCRIPTS test_cxx.sh) add_test(examples_cxx ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=cxx" @@ -40,7 +48,11 @@ endif(ENABLE_cxx) if(ENABLE_f77) - configure_file(test_f77.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_f77.sh @ONLY) + configure_file( + test_f77.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_f77.sh + @ONLY + ) list(APPEND SCRIPTS test_f77.sh) add_test(examples_f77 ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=f77" @@ -48,7 +60,11 @@ endif(ENABLE_f77) if(ENABLE_f95) - configure_file(test_f95.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_f95.sh @ONLY) + configure_file( + test_f95.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_f95.sh + @ONLY + ) list(APPEND SCRIPTS test_f95.sh) add_test(examples_f95 ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=f95" @@ -57,8 +73,8 @@ if(ENABLE_java) configure_file( - test_java.sh.in - ${CMAKE_CURRENT_BINARY_DIR}/test_java.sh + test_java.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_java.sh @ONLY ) list(APPEND SCRIPTS test_java.sh) @@ -69,8 +85,8 @@ if(ENABLE_octave) configure_file( - test_octave.sh.in - ${CMAKE_CURRENT_BINARY_DIR}/test_octave.sh + test_octave.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_octave.sh @ONLY ) list(APPEND SCRIPTS test_octave.sh) @@ -87,8 +103,8 @@ set(NUMPY_EXAMPLES) endif(HAVE_NUMPY) configure_file( - test_python.sh.in - ${CMAKE_CURRENT_BINARY_DIR}/test_python.sh + test_python.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_python.sh @ONLY ) list(APPEND SCRIPTS test_python.sh) @@ -98,7 +114,10 @@ endif(ENABLE_python) if(ENABLE_tcl) - configure_file(test_tcl.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_tcl.sh @ONLY) + configure_file(test_tcl.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_tcl.sh + @ONLY + ) list(APPEND SCRIPTS test_tcl.sh) add_test(examples_tcl ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=tcl" @@ -107,8 +126,8 @@ if(ENABLE_pdl) configure_file( - test_perl.sh.in - ${CMAKE_CURRENT_BINARY_DIR}/test_perl.sh + test_perl.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_perl.sh @ONLY ) list(APPEND SCRIPTS test_perl.sh) @@ -119,8 +138,8 @@ if(ENABLE_ada) configure_file( - test_ada.sh.in - ${CMAKE_CURRENT_BINARY_DIR}/test_ada.sh + test_ada.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_ada.sh @ONLY ) list(APPEND SCRIPTS test_ada.sh) @@ -131,8 +150,8 @@ if(ENABLE_ocaml) configure_file( - test_ocaml.sh.in - ${CMAKE_CURRENT_BINARY_DIR}/test_ocaml.sh + test_ocaml.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_ocaml.sh @ONLY ) list(APPEND SCRIPTS test_ocaml.sh) @@ -207,7 +226,11 @@ endif(PLD_pngcairo) if(DIFF_EXECUTABLE AND TAIL_EXECUTABLE) - configure_file(test_diff.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_diff.sh @ONLY) + configure_file( + test_diff.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_diff.sh + @ONLY + ) list(APPEND SCRIPTS test_diff.sh) add_test(examples_compare ${SH_EXECUTABLE} -c "./test_diff.sh" @@ -251,7 +274,7 @@ foreach(SCRIPT ${SCRIPTS}) install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPT} + FILES ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPT} DESTINATION ${DATA_DIR}/examples PERMISSIONS ${PERM_SCRIPTS} ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-12-15 19:23:09
|
Revision: 9120 http://plplot.svn.sourceforge.net/plplot/?rev=9120&view=rev Author: airwin Date: 2008-12-15 19:23:05 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Add xfig ctest. Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2008-12-15 19:03:34 UTC (rev 9119) +++ trunk/plplot_test/CMakeLists.txt 2008-12-15 19:23:05 UTC (rev 9120) @@ -225,6 +225,14 @@ endif(NOT TEST_DEVICE STREQUAL "pngcairo") endif(PLD_pngcairo) + if(PLD_xfig) + if (NOT TEST_DEVICE STREQUAL "xfig") + add_test(examples_xfig + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=xfig" + ) + endif(NOT TEST_DEVICE STREQUAL "xfig") + endif(PLD_xfig) + if(DIFF_EXECUTABLE AND TAIL_EXECUTABLE) configure_file( test_diff.sh.in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-12-15 19:49:35
|
Revision: 9122 http://plplot.svn.sourceforge.net/plplot/?rev=9122&view=rev Author: airwin Date: 2008-12-15 19:49:22 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Add gif ctest now that we have changed the gif options so that example 2 works with -dev gif. Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2008-12-15 19:47:50 UTC (rev 9121) +++ trunk/plplot_test/CMakeLists.txt 2008-12-15 19:49:22 UTC (rev 9122) @@ -233,6 +233,14 @@ endif(NOT TEST_DEVICE STREQUAL "xfig") endif(PLD_xfig) + if(PLD_gif) + if (NOT TEST_DEVICE STREQUAL "gif") + add_test(examples_gif + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=gif" + ) + endif(NOT TEST_DEVICE STREQUAL "gif") + endif(PLD_gif) + if(DIFF_EXECUTABLE AND TAIL_EXECUTABLE) configure_file( test_diff.sh.in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-03-10 18:38:48
|
Revision: 9702 http://plplot.svn.sourceforge.net/plplot/?rev=9702&view=rev Author: airwin Date: 2009-03-10 18:38:46 +0000 (Tue, 10 Mar 2009) Log Message: ----------- Strip out some redundant logic. Add ctests for cgm device and all qt-related file devices. Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2009-03-10 18:37:38 UTC (rev 9701) +++ trunk/plplot_test/CMakeLists.txt 2009-03-10 18:38:46 UTC (rev 9702) @@ -184,7 +184,7 @@ ) endif(ENABLE_d) -# Run C examples with different drivers + # Run C examples with different drivers if(PLD_psc) if (NOT TEST_DEVICE STREQUAL "psc") add_test(examples_psttfc @@ -194,77 +194,113 @@ endif(PLD_psc) if(PLD_psttf) - if (NOT TEST_DEVICE STREQUAL "psttfc") - add_test(examples_psttfc - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=psttfc" - ) - endif(NOT TEST_DEVICE STREQUAL "psttfc") + add_test(examples_psttfc + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=psttfc" + ) endif(PLD_psttf) if(PLD_pstex) - if (NOT TEST_DEVICE STREQUAL "pstex") - add_test(examples_pstex - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pstex" - ) - endif(NOT TEST_DEVICE STREQUAL "pstex") + add_test(examples_pstex + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pstex" + ) endif(PLD_pstex) if(PLD_png) - if (NOT TEST_DEVICE STREQUAL "png") - add_test(examples_png - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=png" - ) - endif(NOT TEST_DEVICE STREQUAL "png") + add_test(examples_png + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=png" + ) endif(PLD_png) if(PLD_svg) - if (NOT TEST_DEVICE STREQUAL "svg") - add_test(examples_svg - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=svg" - ) - endif(NOT TEST_DEVICE STREQUAL "svg") + add_test(examples_svg + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=svg" + ) endif(PLD_svg) if(PLD_plmeta) - if (NOT TEST_DEVICE STREQUAL "plmeta") - add_test(examples_plmeta - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=plmeta" - ) - endif(NOT TEST_DEVICE STREQUAL "plmeta") + add_test(examples_plmeta + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=plmeta" + ) endif(PLD_plmeta) if(PLD_pscairo) - if (NOT TEST_DEVICE STREQUAL "pscairo") - add_test(examples_pscairo - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pscairo" - ) - endif(NOT TEST_DEVICE STREQUAL "pscairo") + add_test(examples_pscairo + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pscairo" + ) endif(PLD_pscairo) if(PLD_pngcairo) - if (NOT TEST_DEVICE STREQUAL "pngcairo") - add_test(examples_pngcairo - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pngcairo" - ) - endif(NOT TEST_DEVICE STREQUAL "pngcairo") + add_test(examples_pngcairo + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pngcairo" + ) endif(PLD_pngcairo) if(PLD_xfig) - if (NOT TEST_DEVICE STREQUAL "xfig") - add_test(examples_xfig - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=xfig" - ) - endif(NOT TEST_DEVICE STREQUAL "xfig") + add_test(examples_xfig + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=xfig" + ) endif(PLD_xfig) if(PLD_gif) - if (NOT TEST_DEVICE STREQUAL "gif") - add_test(examples_gif - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=gif" - ) - endif(NOT TEST_DEVICE STREQUAL "gif") + add_test(examples_gif + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=gif" + ) endif(PLD_gif) + if(PLD_cgm) + add_test(examples_cgm + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=cgm" + ) + endif(PLD_cgm) + + if(PLD_bmpqt) + add_test(examples_bmpqt + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=bmpqt" + ) + endif(PLD_bmpqt) + + if(PLD_jpgqt) + add_test(examples_jpgqt + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=jpgqt" + ) + endif(PLD_jpgqt) + + if(PLD_pngqt) + add_test(examples_pngqt + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pngqt" + ) + endif(PLD_pngqt) + + if(PLD_ppmqt) + add_test(examples_ppmqt + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=ppmqt" + ) + endif(PLD_ppmqt) + + if(PLD_tiffqt) + add_test(examples_tiffqt + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=tiffqt" + ) + endif(PLD_tiffqt) + + if(PLD_svgqt) + add_test(examples_svgqt + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=svgqt" + ) + endif(PLD_svgqt) + + if(PLD_epsqt) + add_test(examples_epsqt + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=epsqt" + ) + endif(PLD_epsqt) + + if(PLD_pdfqt) + add_test(examples_pdfqt + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pdfqt" + ) + endif(PLD_pdfqt) + if(DIFF_EXECUTABLE AND TAIL_EXECUTABLE) configure_file( test_diff.sh.in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-12-17 01:47:53
|
Revision: 11373 http://plplot.svn.sourceforge.net/plplot/?rev=11373&view=rev Author: airwin Date: 2010-12-17 01:47:47 +0000 (Fri, 17 Dec 2010) Log Message: ----------- Drop extra "/" that was being put into drive-letter form of pathname. A nice side benefit of this change is you tighten up the logic for recognizing the leading-slash form of drive letter. Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2010-12-17 01:42:06 UTC (rev 11372) +++ trunk/plplot_test/CMakeLists.txt 2010-12-17 01:47:47 UTC (rev 11373) @@ -168,7 +168,7 @@ # drive letter doesn't matter. For example converting # z:/whatever/path ==> /z/whatever/path or /Z/whatever/path works # fine for MSYS bash. - string(REGEX REPLACE "^(.):" "/\\1/" PLTCL_DIR ${PLTCL_DIR}) + string(REGEX REPLACE "^(.):/" "/\\1/" PLTCL_DIR ${PLTCL_DIR}) configure_file(test_tcl.sh.in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2011-03-19 19:41:52
|
Revision: 11652 http://plplot.svn.sourceforge.net/plplot/?rev=11652&view=rev Author: airwin Date: 2011-03-19 19:41:45 +0000 (Sat, 19 Mar 2011) Log Message: ----------- CMake-2.8.4 (and prior versions of 2.8.x?) has a bug where ctests are done in arbitrary order rather than in the order of the add_test commands. According to cmake mailing lists remarks, this bug will be fixed in 2.8.5. However, from the results of this bug the examples_compare test was done first which reminded me that test depends on other tests to prepare the files that are needed. Therefore, I have put in that inter-test dependency via the DEPENDS property you can set with set_tests_properties for cmake-2.8.x (but not cmake-2.6.x which requires some extra cmake version logic). That change works around the arbitrary ordering bug for cmake-2.8.4 and is a good idea on general principles (say if someone ever wanted to try to get parallel ctests to work). Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2011-03-19 18:39:03 UTC (rev 11651) +++ trunk/plplot_test/CMakeLists.txt 2011-03-19 19:41:45 UTC (rev 11652) @@ -70,9 +70,11 @@ ) list(APPEND SCRIPTS test_c_interactive.sh) + set(examples_compare_DEPENDS) add_test(examples_c ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=c" ) + list(APPEND examples_compare_DEPENDS examples_c) if(ENABLE_cxx) configure_file( @@ -84,6 +86,7 @@ add_test(examples_cxx ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=cxx" ) + list(APPEND examples_compare_DEPENDS examples_cxx) endif(ENABLE_cxx) if(ENABLE_f77) @@ -96,6 +99,7 @@ add_test(examples_f77 ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=f77" ) + list(APPEND examples_compare_DEPENDS examples_f77) endif(ENABLE_f77) if(ENABLE_f95) @@ -108,6 +112,7 @@ add_test(examples_f95 ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=f95" ) + list(APPEND examples_compare_DEPENDS examples_f95) endif(ENABLE_f95) if(ENABLE_java) @@ -120,6 +125,7 @@ add_test(examples_java ${SH_EXECUTABLE} -c "${JAVA_TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=java" ) + list(APPEND examples_compare_DEPENDS examples_java) endif(ENABLE_java) if(ENABLE_octave) @@ -147,6 +153,7 @@ add_test(examples_octave ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=octave" ) + list(APPEND examples_compare_DEPENDS examples_octave) endif(ENABLE_octave) if(ENABLE_python) @@ -165,6 +172,7 @@ add_test(examples_python ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=python" ) + list(APPEND examples_compare_DEPENDS examples_python) endif(ENABLE_python) if(ENABLE_tcl) @@ -186,6 +194,7 @@ add_test(examples_tcl ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=tcl" ) + list(APPEND examples_compare_DEPENDS examples_tcl) set(PLTCL_DIR ${BIN_DIR}) # Transform drive-letter form to leading-slash form, see comment above. string(REGEX REPLACE "^(.):" "/\\1/" PLTCL_DIR ${PLTCL_DIR}) @@ -206,6 +215,7 @@ add_test(examples_pdl ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=pdl" ) + list(APPEND examples_compare_DEPENDS examples_pdl) endif(ENABLE_pdl) if(ENABLE_ada) @@ -218,6 +228,7 @@ add_test(examples_ada ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ada" ) + list(APPEND examples_compare_DEPENDS examples_ada) endif(ENABLE_ada) if(ENABLE_ocaml) @@ -230,6 +241,7 @@ add_test(examples_ocaml ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ocaml" ) + list(APPEND examples_compare_DEPENDS examples_ocaml) endif(ENABLE_ocaml) if(ENABLE_lua) @@ -242,6 +254,7 @@ add_test(examples_lua ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=lua" ) + list(APPEND examples_compare_DEPENDS examples_lua) endif(ENABLE_lua) if(ENABLE_d) @@ -254,6 +267,7 @@ add_test(examples_d ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=d" ) + list(APPEND examples_compare_DEPENDS examples_d) endif(ENABLE_d) # Run C examples with different drivers @@ -389,6 +403,19 @@ add_test(examples_compare ${SH_EXECUTABLE} -c "./test_diff.sh" ) + # There is a bug in 2.8.x with x < 5 where tests are run out of + # the order in which they are declared by default. + # Also, 2.8.x can run repeat tests out of order due + # to some optimizations that have been implemented. So for + # 2.8.x and above always force examples_compare to be run + # after the other tests it depends on. + if(CMAKE_MAJOR_VERSION EQUAL 2 AND NOT CMAKE_MINOR_VERSION LESS 8) + #message(STATUS "DEBUG: examples_compare_DEPENDS = ${examples_compare_DEPENDS}") + set_tests_properties(examples_compare + PROPERTIES + DEPENDS "${examples_compare_DEPENDS}" + ) + endif(CMAKE_MAJOR_VERSION EQUAL 2 AND NOT CMAKE_MINOR_VERSION LESS 8) endif(CMP_EXECUTABLE OR DIFF_EXECUTABLE AND TAIL_EXECUTABLE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2011-10-14 00:14:35
|
Revision: 11959 http://plplot.svn.sourceforge.net/plplot/?rev=11959&view=rev Author: airwin Date: 2011-10-14 00:14:28 +0000 (Fri, 14 Oct 2011) Log Message: ----------- Add clean_ctest_plot_files custom target to do what its name implies. Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2011-10-13 21:45:47 UTC (rev 11958) +++ trunk/plplot_test/CMakeLists.txt 2011-10-14 00:14:28 UTC (rev 11959) @@ -70,11 +70,14 @@ ) list(APPEND SCRIPTS test_c_interactive.sh) + set(test_output_files_LIST) set(examples_compare_DEPENDS) add_test(examples_c ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=c" ) list(APPEND examples_compare_DEPENDS examples_c) + list_example_files(. ${TEST_DEVICE} c output_list) + list(APPEND test_output_files_LIST ${output_list}) if(ENABLE_cxx) configure_file( @@ -87,6 +90,8 @@ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=cxx" ) list(APPEND examples_compare_DEPENDS examples_cxx) + list_example_files(. ${TEST_DEVICE} cxx output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(ENABLE_cxx) if(ENABLE_f77) @@ -100,6 +105,8 @@ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=f77" ) list(APPEND examples_compare_DEPENDS examples_f77) + list_example_files(. ${TEST_DEVICE} f output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(ENABLE_f77) if(ENABLE_f95) @@ -113,6 +120,8 @@ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=f95" ) list(APPEND examples_compare_DEPENDS examples_f95) + list_example_files(. ${TEST_DEVICE} f95 output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(ENABLE_f95) if(ENABLE_java) @@ -126,6 +135,8 @@ ${SH_EXECUTABLE} -c "${JAVA_TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=java" ) list(APPEND examples_compare_DEPENDS examples_java) + list_example_files(. ${TEST_DEVICE} j output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(ENABLE_java) if(ENABLE_octave) @@ -154,6 +165,8 @@ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=octave" ) list(APPEND examples_compare_DEPENDS examples_octave) + list_example_files(. ${TEST_DEVICE} o output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(ENABLE_octave) if(ENABLE_python) @@ -173,6 +186,8 @@ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=python" ) list(APPEND examples_compare_DEPENDS examples_python) + list_example_files(. ${TEST_DEVICE} p output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(ENABLE_python) if(ENABLE_tcl) @@ -195,6 +210,8 @@ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=tcl" ) list(APPEND examples_compare_DEPENDS examples_tcl) + list_example_files(. ${TEST_DEVICE} t output_list) + list(APPEND test_output_files_LIST ${output_list}) set(PLTCL_DIR ${BIN_DIR}) # Transform drive-letter form to leading-slash form, see comment above. string(REGEX REPLACE "^(.):" "/\\1/" PLTCL_DIR ${PLTCL_DIR}) @@ -216,6 +233,8 @@ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=pdl" ) list(APPEND examples_compare_DEPENDS examples_pdl) + list_example_files(. ${TEST_DEVICE} pdl output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(ENABLE_pdl) if(ENABLE_ada) @@ -229,6 +248,8 @@ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ada" ) list(APPEND examples_compare_DEPENDS examples_ada) + list_example_files(. ${TEST_DEVICE} a output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(ENABLE_ada) if(ENABLE_ocaml) @@ -242,6 +263,8 @@ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ocaml" ) list(APPEND examples_compare_DEPENDS examples_ocaml) + list_example_files(. ${TEST_DEVICE} ocaml output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(ENABLE_ocaml) if(ENABLE_lua) @@ -255,6 +278,8 @@ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=lua" ) list(APPEND examples_compare_DEPENDS examples_lua) + list_example_files(. ${TEST_DEVICE} lua output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(ENABLE_lua) if(ENABLE_d) @@ -268,14 +293,18 @@ ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=d" ) list(APPEND examples_compare_DEPENDS examples_d) + list_example_files(. ${TEST_DEVICE} d output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(ENABLE_d) # Run C examples with different drivers if(PLD_psc) if (NOT TEST_DEVICE STREQUAL "psc") - add_test(examples_psttfc - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=psttfc" + add_test(examples_psc + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=psc" ) + list_example_files(. psc c output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(NOT TEST_DEVICE STREQUAL "psc") endif(PLD_psc) @@ -283,114 +312,152 @@ add_test(examples_psttfc ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=psttfc" ) + list_example_files(. psttfc c output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(PLD_psttf) if(PLD_pstex) add_test(examples_pstex ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pstex" ) + list_example_files(. pstex c output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(PLD_pstex) if(PLD_png) add_test(examples_png ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=png" ) + list_example_files(. png c output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(PLD_png) if(PLD_svg) add_test(examples_svg ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=svg" ) + list_example_files(. svg c output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(PLD_svg) if(PLD_plmeta) add_test(examples_plmeta ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=plmeta" ) + list_example_files(. plmeta c output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(PLD_plmeta) if(PLD_pscairo) add_test(examples_pscairo ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pscairo" ) + list_example_files(. pscairo c output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(PLD_pscairo) if(PLD_pngcairo) add_test(examples_pngcairo ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pngcairo" ) + list_example_files(. pngcairo c output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(PLD_pngcairo) if(PLD_xfig) add_test(examples_xfig ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=xfig" ) + list_example_files(. xfig c output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(PLD_xfig) if(PLD_gif) add_test(examples_gif ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=gif" ) + list_example_files(. gif c output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(PLD_gif) if(PLD_cgm) add_test(examples_cgm ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=cgm" ) + list_example_files(. cgm c output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(PLD_cgm) if(PLD_bmpqt) add_test(examples_bmpqt ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=bmpqt" ) + list_example_files(. bmpqt c output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(PLD_bmpqt) if(PLD_jpgqt) add_test(examples_jpgqt ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=jpgqt" ) + list_example_files(. jpgqt c output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(PLD_jpgqt) if(PLD_pngqt) add_test(examples_pngqt ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pngqt" ) + list_example_files(. pngqt c output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(PLD_pngqt) if(PLD_ppmqt) add_test(examples_ppmqt ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=ppmqt" ) + list_example_files(. ppmqt c output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(PLD_ppmqt) if(PLD_tiffqt) add_test(examples_tiffqt ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=tiffqt" ) + list_example_files(. tiffqt c output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(PLD_tiffqt) if(PLD_svgqt) add_test(examples_svgqt ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=svgqt" ) + list_example_files(. svgqt c output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(PLD_svgqt) if(PLD_epsqt) add_test(examples_epsqt ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=epsqt" ) + list_example_files(. epsqt c output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(PLD_epsqt) if(PLD_pdfqt) add_test(examples_pdfqt ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pdfqt" ) + list_example_files(. pdfqt c output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(PLD_pdfqt) if(PLD_pdf) add_test(examples_pdf ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pdf" ) + list_example_files(. pdf c output_list) + list(APPEND test_output_files_LIST ${output_list}) endif(PLD_pdf) if(CMP_EXECUTABLE OR DIFF_EXECUTABLE AND TAIL_EXECUTABLE) @@ -418,11 +485,9 @@ endif(CMAKE_MAJOR_VERSION EQUAL 2 AND NOT CMAKE_MINOR_VERSION LESS 8) endif(CMP_EXECUTABLE OR DIFF_EXECUTABLE AND TAIL_EXECUTABLE) - - # Make a copy of lena.pgm to the test subdirectory of the build - # tree so that example 20 will run from there. - # Also need a copy of lena.img for the octave bindings if(BUILD_TEST) + # Make a copy of lena.pgm to the test subdirectory of the build + # tree so that example 20 will run from there. add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm COMMAND ${CMAKE_COMMAND} -E copy @@ -432,6 +497,7 @@ ) add_custom_target(lena_file ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm) if(ENABLE_octave) + # Also need a copy of lena.img for the octave bindings add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lena.img COMMAND ${CMAKE_COMMAND} -E copy @@ -441,6 +507,16 @@ ) add_custom_target(lena_octave_file ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/lena.img) endif(ENABLE_octave) + + # Custom target to remove everything created by ctest + # N.B. the test_output_files_LIST is extremely long and + # overflows the maximum line length of the shell if you + # replace "." above with ${CMAKE_CURRENT_BINARY_DIR} + add_custom_target(clean_ctest_plot_files + COMMAND ${CMAKE_COMMAND} -E remove ${test_output_files_LIST} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + ) + endif(BUILD_TEST) set(PERM_SCRIPTS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-12-10 23:49:31
|
Revision: 12839 http://sourceforge.net/p/plplot/code/12839 Author: airwin Date: 2013-12-10 23:49:29 +0000 (Tue, 10 Dec 2013) Log Message: ----------- Drop tests involving -dev psc (for the unusual case) when that device is not enabled. Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2013-12-10 23:46:45 UTC (rev 12838) +++ trunk/plplot_test/CMakeLists.txt 2013-12-10 23:49:29 UTC (rev 12839) @@ -2,7 +2,7 @@ ### ### Process this file with cmake to produce Makefile ### -# Copyright (C) 2006-2010 Alan W. Irwin +# Copyright (C) 2006-2013 Alan W. Irwin # # This file is part of PLplot. # @@ -96,13 +96,16 @@ set(test_output_files_LIST) set(examples_compare_DEPENDS) - add_test(examples_c - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=c" - ) - list(APPEND examples_compare_DEPENDS examples_c) - list_example_files(. ${TEST_DEVICE} c output_list) - list(APPEND test_output_files_LIST ${output_list}) + if(PLD_${TEST_DEVICE}) + add_test(examples_c + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=c" + ) + list(APPEND examples_compare_DEPENDS examples_c) + list_example_files(. ${TEST_DEVICE} c output_list) + list(APPEND test_output_files_LIST ${output_list}) + endif(PLD_${TEST_DEVICE}) + if(ENABLE_cxx) configure_file( test_cxx.sh.in @@ -110,12 +113,14 @@ @ONLY ) list(APPEND SCRIPTS test_cxx.sh) - add_test(examples_cxx - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=cxx" - ) - list(APPEND examples_compare_DEPENDS examples_cxx) - list_example_files(. ${TEST_DEVICE} cxx output_list) - list(APPEND test_output_files_LIST ${output_list}) + if(PLD_${TEST_DEVICE}) + add_test(examples_cxx + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=cxx" + ) + list(APPEND examples_compare_DEPENDS examples_cxx) + list_example_files(. ${TEST_DEVICE} cxx output_list) + list(APPEND test_output_files_LIST ${output_list}) + endif(PLD_${TEST_DEVICE}) endif(ENABLE_cxx) if(ENABLE_f95) @@ -125,12 +130,14 @@ @ONLY ) list(APPEND SCRIPTS test_f95.sh) - add_test(examples_f95 - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=f95" - ) - list(APPEND examples_compare_DEPENDS examples_f95) - list_example_files(. ${TEST_DEVICE} f95 output_list) - list(APPEND test_output_files_LIST ${output_list}) + if(PLD_${TEST_DEVICE}) + add_test(examples_f95 + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=f95" + ) + list(APPEND examples_compare_DEPENDS examples_f95) + list_example_files(. ${TEST_DEVICE} f95 output_list) + list(APPEND test_output_files_LIST ${output_list}) + endif(PLD_${TEST_DEVICE}) endif(ENABLE_f95) if(ENABLE_java) @@ -140,12 +147,14 @@ @ONLY ) list(APPEND SCRIPTS test_java.sh) - add_test(examples_java - ${SH_EXECUTABLE} -c "${JAVA_TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=java" - ) - list(APPEND examples_compare_DEPENDS examples_java) - list_example_files(. ${TEST_DEVICE} j output_list) - list(APPEND test_output_files_LIST ${output_list}) + if(PLD_${TEST_DEVICE}) + add_test(examples_java + ${SH_EXECUTABLE} -c "${JAVA_TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=java" + ) + list(APPEND examples_compare_DEPENDS examples_java) + list_example_files(. ${TEST_DEVICE} j output_list) + list(APPEND test_output_files_LIST ${output_list}) + endif(PLD_${TEST_DEVICE}) endif(ENABLE_java) if(ENABLE_octave) @@ -163,12 +172,14 @@ @ONLY ) list(APPEND SCRIPTS test_octave.sh) - add_test(examples_octave - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=octave" - ) - list(APPEND examples_compare_DEPENDS examples_octave) - list_example_files(. ${TEST_DEVICE} o output_list) - list(APPEND test_output_files_LIST ${output_list}) + if(PLD_${TEST_DEVICE}) + add_test(examples_octave + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=octave" + ) + list(APPEND examples_compare_DEPENDS examples_octave) + list_example_files(. ${TEST_DEVICE} o output_list) + list(APPEND test_output_files_LIST ${output_list}) + endif(PLD_${TEST_DEVICE}) endif(ENABLE_octave) if(ENABLE_python) @@ -178,12 +189,14 @@ @ONLY ) list(APPEND SCRIPTS test_python.sh) - add_test(examples_python - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=python" - ) - list(APPEND examples_compare_DEPENDS examples_python) - list_example_files(. ${TEST_DEVICE} p output_list) - list(APPEND test_output_files_LIST ${output_list}) + if(PLD_${TEST_DEVICE}) + add_test(examples_python + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=python" + ) + list(APPEND examples_compare_DEPENDS examples_python) + list_example_files(. ${TEST_DEVICE} p output_list) + list(APPEND test_output_files_LIST ${output_list}) + endif(PLD_${TEST_DEVICE}) endif(ENABLE_python) if(ENABLE_tcl) @@ -202,12 +215,14 @@ ${CMAKE_CURRENT_BINARY_DIR}/test_tcl.sh @ONLY ) - add_test(examples_tcl - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=tcl" - ) - list(APPEND examples_compare_DEPENDS examples_tcl) - list_example_files(. ${TEST_DEVICE} t output_list) - list(APPEND test_output_files_LIST ${output_list}) + if(PLD_${TEST_DEVICE}) + add_test(examples_tcl + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=tcl" + ) + list(APPEND examples_compare_DEPENDS examples_tcl) + list_example_files(. ${TEST_DEVICE} t output_list) + list(APPEND test_output_files_LIST ${output_list}) + endif(PLD_${TEST_DEVICE}) set(PLTCL_DIR ${BIN_DIR}) # Transform drive-letter form to leading-slash form, see comment above. string(REGEX REPLACE "^(.):" "/\\1/" PLTCL_DIR ${PLTCL_DIR}) @@ -225,12 +240,14 @@ @ONLY ) list(APPEND SCRIPTS test_pdl.sh) - add_test(examples_pdl - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=pdl" - ) - list(APPEND examples_compare_DEPENDS examples_pdl) - list_example_files(. ${TEST_DEVICE} pdl output_list) - list(APPEND test_output_files_LIST ${output_list}) + if(PLD_${TEST_DEVICE}) + add_test(examples_pdl + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=pdl" + ) + list(APPEND examples_compare_DEPENDS examples_pdl) + list_example_files(. ${TEST_DEVICE} pdl output_list) + list(APPEND test_output_files_LIST ${output_list}) + endif(PLD_${TEST_DEVICE}) endif(ENABLE_pdl) if(ENABLE_ada) @@ -240,12 +257,14 @@ @ONLY ) list(APPEND SCRIPTS test_ada.sh) - add_test(examples_ada - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ada" - ) - list(APPEND examples_compare_DEPENDS examples_ada) - list_example_files(. ${TEST_DEVICE} a output_list) - list(APPEND test_output_files_LIST ${output_list}) + if(PLD_${TEST_DEVICE}) + add_test(examples_ada + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ada" + ) + list(APPEND examples_compare_DEPENDS examples_ada) + list_example_files(. ${TEST_DEVICE} a output_list) + list(APPEND test_output_files_LIST ${output_list}) + endif(PLD_${TEST_DEVICE}) endif(ENABLE_ada) if(ENABLE_ocaml) @@ -255,12 +274,14 @@ @ONLY ) list(APPEND SCRIPTS test_ocaml.sh) - add_test(examples_ocaml - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ocaml" - ) - list(APPEND examples_compare_DEPENDS examples_ocaml) - list_example_files(. ${TEST_DEVICE} ocaml output_list) - list(APPEND test_output_files_LIST ${output_list}) + if(PLD_${TEST_DEVICE}) + add_test(examples_ocaml + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ocaml" + ) + list(APPEND examples_compare_DEPENDS examples_ocaml) + list_example_files(. ${TEST_DEVICE} ocaml output_list) + list(APPEND test_output_files_LIST ${output_list}) + endif(PLD_${TEST_DEVICE}) endif(ENABLE_ocaml) if(ENABLE_lua) @@ -270,12 +291,14 @@ @ONLY ) list(APPEND SCRIPTS test_lua.sh) - add_test(examples_lua - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=lua" - ) - list(APPEND examples_compare_DEPENDS examples_lua) - list_example_files(. ${TEST_DEVICE} lua output_list) - list(APPEND test_output_files_LIST ${output_list}) + if(PLD_${TEST_DEVICE}) + add_test(examples_lua + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=lua" + ) + list(APPEND examples_compare_DEPENDS examples_lua) + list_example_files(. ${TEST_DEVICE} lua output_list) + list(APPEND test_output_files_LIST ${output_list}) + endif(PLD_${TEST_DEVICE}) endif(ENABLE_lua) if(ENABLE_d) @@ -285,12 +308,14 @@ @ONLY ) list(APPEND SCRIPTS test_d.sh) - add_test(examples_d - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=d" - ) - list(APPEND examples_compare_DEPENDS examples_d) - list_example_files(. ${TEST_DEVICE} d output_list) - list(APPEND test_output_files_LIST ${output_list}) + if(PLD_${TEST_DEVICE}) + add_test(examples_d + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=d" + ) + list(APPEND examples_compare_DEPENDS examples_d) + list_example_files(. ${TEST_DEVICE} d output_list) + list(APPEND test_output_files_LIST ${output_list}) + endif(PLD_${TEST_DEVICE}) endif(ENABLE_d) # Run C examples with different drivers This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-05-18 21:59:53
|
Revision: 13123 http://sourceforge.net/p/plplot/code/13123 Author: airwin Date: 2014-05-18 21:59:51 +0000 (Sun, 18 May 2014) Log Message: ----------- Store all results of the examples run by ctest in their own unique subdirectory of the build tree. This keeps the plplot_test subdirectory much cleaner, and makes it easy to implement a clean and quick way to remove all those ctest-generated files. This change solves two bugs with the old method of removing all the generated files using a list of filenames; that method was inexact (the list of filenames was incomplete) and more seriously also ran into command-line length issues for the cmd environment used for the "MinGW Makefiles" generator case. Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2014-05-18 21:53:26 UTC (rev 13122) +++ trunk/plplot_test/CMakeLists.txt 2014-05-18 21:59:51 UTC (rev 13123) @@ -23,9 +23,13 @@ # a shell is available. if(SH_EXECUTABLE) + + set(CTEST_EXAMPLES_OUTPUT_DIR ${CMAKE_BINARY_DIR}/ctest_examples_output_dir) + file(MAKE_DIRECTORY ${CTEST_EXAMPLES_OUTPUT_DIR}) + set(SCRIPTS) set(TEST_ENVIRONMENT - "EXAMPLES_DIR=${CMAKE_BINARY_DIR}/examples SRC_EXAMPLES_DIR=${CMAKE_SOURCE_DIR}/examples" + "EXAMPLES_DIR=${CMAKE_BINARY_DIR}/examples SRC_EXAMPLES_DIR=${CMAKE_SOURCE_DIR}/examples OUTPUT_DIR=${CTEST_EXAMPLES_OUTPUT_DIR}" ) set(TEST_DEVICE psc CACHE STRING "device used for ctest") @@ -120,16 +124,14 @@ ) list(APPEND SCRIPTS test_c_interactive.sh) - set(test_output_files_LIST) set(examples_compare_DEPENDS) if(PLD_TEST_DEVICE) - add_test(examples_c - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=c" + add_test(NAME examples_c + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=c" ) list(APPEND examples_compare_DEPENDS examples_c) - list_example_files(. ${TEST_DEVICE} c output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_TEST_DEVICE) if(ENABLE_cxx) @@ -140,12 +142,11 @@ ) list(APPEND SCRIPTS test_cxx.sh) if(PLD_TEST_DEVICE) - add_test(examples_cxx - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=cxx" + add_test(NAME examples_cxx + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=cxx" ) list(APPEND examples_compare_DEPENDS examples_cxx) - list_example_files(. ${TEST_DEVICE} cxx output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_TEST_DEVICE) endif(ENABLE_cxx) @@ -157,12 +158,11 @@ ) list(APPEND SCRIPTS test_f95.sh) if(PLD_TEST_DEVICE) - add_test(examples_f95 - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=f95" + add_test(NAME examples_f95 + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=f95" ) list(APPEND examples_compare_DEPENDS examples_f95) - list_example_files(. ${TEST_DEVICE} f95 output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_TEST_DEVICE) endif(ENABLE_f95) @@ -174,12 +174,11 @@ ) list(APPEND SCRIPTS test_java.sh) if(PLD_TEST_DEVICE) - add_test(examples_java - ${SH_EXECUTABLE} -c "${JAVA_TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=java" + add_test(NAME examples_java + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${JAVA_TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=java" ) list(APPEND examples_compare_DEPENDS examples_java) - list_example_files(. ${TEST_DEVICE} j output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_TEST_DEVICE) endif(ENABLE_java) @@ -199,12 +198,11 @@ ) list(APPEND SCRIPTS test_octave.sh) if(PLD_TEST_DEVICE) - add_test(examples_octave - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=octave" + add_test(NAME examples_octave + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=octave" ) list(APPEND examples_compare_DEPENDS examples_octave) - list_example_files(. ${TEST_DEVICE} o output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_TEST_DEVICE) endif(ENABLE_octave) @@ -216,12 +214,11 @@ ) list(APPEND SCRIPTS test_python.sh) if(PLD_TEST_DEVICE) - add_test(examples_python - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=python" + add_test(NAME examples_python + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=python" ) list(APPEND examples_compare_DEPENDS examples_python) - list_example_files(. ${TEST_DEVICE} p output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_TEST_DEVICE) endif(ENABLE_python) @@ -242,12 +239,11 @@ @ONLY ) if(PLD_TEST_DEVICE) - add_test(examples_tcl - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=tcl" + add_test(NAME examples_tcl + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=tcl" ) list(APPEND examples_compare_DEPENDS examples_tcl) - list_example_files(. ${TEST_DEVICE} t output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_TEST_DEVICE) set(PLTCL_DIR ${BIN_DIR}) # Transform drive-letter form to leading-slash form, see comment above. @@ -267,12 +263,11 @@ ) list(APPEND SCRIPTS test_pdl.sh) if(PLD_TEST_DEVICE) - add_test(examples_pdl - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=pdl" + add_test(NAME examples_pdl + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=pdl" ) list(APPEND examples_compare_DEPENDS examples_pdl) - list_example_files(. ${TEST_DEVICE} pdl output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_TEST_DEVICE) endif(ENABLE_pdl) @@ -284,12 +279,11 @@ ) list(APPEND SCRIPTS test_ada.sh) if(PLD_TEST_DEVICE) - add_test(examples_ada - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ada" + add_test(NAME examples_ada + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ada" ) list(APPEND examples_compare_DEPENDS examples_ada) - list_example_files(. ${TEST_DEVICE} a output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_TEST_DEVICE) endif(ENABLE_ada) @@ -301,12 +295,11 @@ ) list(APPEND SCRIPTS test_ocaml.sh) if(PLD_TEST_DEVICE) - add_test(examples_ocaml - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ocaml" + add_test(NAME examples_ocaml + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ocaml" ) list(APPEND examples_compare_DEPENDS examples_ocaml) - list_example_files(. ${TEST_DEVICE} ocaml output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_TEST_DEVICE) endif(ENABLE_ocaml) @@ -318,12 +311,11 @@ ) list(APPEND SCRIPTS test_lua.sh) if(PLD_TEST_DEVICE) - add_test(examples_lua - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=lua" + add_test(NAME examples_lua + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=lua" ) list(APPEND examples_compare_DEPENDS examples_lua) - list_example_files(. ${TEST_DEVICE} lua output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_TEST_DEVICE) endif(ENABLE_lua) @@ -335,176 +327,155 @@ ) list(APPEND SCRIPTS test_d.sh) if(PLD_TEST_DEVICE) - add_test(examples_d - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=d" + add_test(NAME examples_d + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=d" ) list(APPEND examples_compare_DEPENDS examples_d) - list_example_files(. ${TEST_DEVICE} d output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_TEST_DEVICE) endif(ENABLE_d) # Run C examples with different drivers if(PLD_ps) if (NOT TEST_DEVICE STREQUAL "psc") - add_test(examples_psc - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=psc" + add_test(NAME examples_psc + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=psc" ) - list_example_files(. psc c output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(NOT TEST_DEVICE STREQUAL "psc") endif(PLD_ps) if(PLD_psttf) - add_test(examples_psttfc - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=psttfc" + add_test(NAME examples_psttfc + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=psttfc" ) - list_example_files(. psttfc c output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_psttf) if(PLD_pstex) - add_test(examples_pstex - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pstex" + add_test(NAME examples_pstex + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pstex" ) - list_example_files(. pstex c output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_pstex) if(PLD_png) - add_test(examples_png - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=png" + add_test(NAME examples_png + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=png" ) - list_example_files(. png c output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_png) if(PLD_svg) - add_test(examples_svg - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=svg" + add_test(NAME examples_svg + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=svg" ) - list_example_files(. svg c output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_svg) if(PLD_plmeta) - add_test(examples_plmeta - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=plmeta" + add_test(NAME examples_plmeta + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=plmeta" ) - list_example_files(. plmeta c output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_plmeta) if(PLD_pscairo) - add_test(examples_pscairo - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pscairo" + add_test(NAME examples_pscairo + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pscairo" ) - list_example_files(. pscairo c output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_pscairo) if(PLD_pngcairo) - add_test(examples_pngcairo - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pngcairo" + add_test(NAME examples_pngcairo + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pngcairo" ) - list_example_files(. pngcairo c output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_pngcairo) if(PLD_xfig) - add_test(examples_xfig - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=xfig" + add_test(NAME examples_xfig + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=xfig" ) - list_example_files(. xfig c output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_xfig) if(PLD_gif) - add_test(examples_gif - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=gif" + add_test(NAME examples_gif + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=gif" ) - list_example_files(. gif c output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_gif) if(PLD_cgm) - add_test(examples_cgm - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=cgm" + add_test(NAME examples_cgm + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=cgm" ) - list_example_files(. cgm c output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_cgm) if(PLD_bmpqt) - add_test(examples_bmpqt - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=bmpqt" + add_test(NAME examples_bmpqt + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=bmpqt" ) - list_example_files(. bmpqt c output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_bmpqt) if(PLD_jpgqt) - add_test(examples_jpgqt - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=jpgqt" + add_test(NAME examples_jpgqt + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=jpgqt" ) - list_example_files(. jpgqt c output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_jpgqt) if(PLD_pngqt) - add_test(examples_pngqt - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pngqt" + add_test(NAME examples_pngqt + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pngqt" ) - list_example_files(. pngqt c output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_pngqt) if(PLD_ppmqt) - add_test(examples_ppmqt - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=ppmqt" + add_test(NAME examples_ppmqt + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=ppmqt" ) - list_example_files(. ppmqt c output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_ppmqt) if(PLD_tiffqt) - add_test(examples_tiffqt - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=tiffqt" + add_test(NAME examples_tiffqt + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=tiffqt" ) - list_example_files(. tiffqt c output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_tiffqt) if(PLD_svgqt) - add_test(examples_svgqt - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=svgqt" + add_test(NAME examples_svgqt + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=svgqt" ) - list_example_files(. svgqt c output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_svgqt) if(PLD_epsqt) - add_test(examples_epsqt - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=epsqt" + add_test(NAME examples_epsqt + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=epsqt" ) - list_example_files(. epsqt c output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_epsqt) if(PLD_pdfqt) - add_test(examples_pdfqt - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pdfqt" + add_test(NAME examples_pdfqt + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pdfqt" ) - list_example_files(. pdfqt c output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_pdfqt) if(PLD_pdf) - add_test(examples_pdf - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pdf" + add_test(NAME examples_pdf + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pdf" ) - list_example_files(. pdf c output_list) - list(APPEND test_output_files_LIST ${output_list}) endif(PLD_pdf) if(CMP_EXECUTABLE OR DIFF_EXECUTABLE AND TAIL_EXECUTABLE) @@ -514,8 +485,9 @@ @ONLY ) list(APPEND SCRIPTS test_diff.sh) - add_test(examples_compare - ${SH_EXECUTABLE} -c "./test_diff.sh" + add_test(NAME examples_compare + WORKING_DIRECTORY ${CTEST_EXAMPLES_OUTPUT_DIR} + COMMAND ${SH_EXECUTABLE} -c "${CMAKE_CURRENT_BINARY_DIR}/test_diff.sh" ) # There is a bug in 2.8.x with x < 5 where tests are run out of # the order in which they are declared by default. Also, 2.8.x @@ -552,13 +524,14 @@ add_custom_target(lena_octave_file ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/lena.img) endif(ENABLE_octave) - # Custom target to remove everything created by ctest - # N.B. the test_output_files_LIST is extremely long and - # overflows the maximum line length of the shell if you - # replace "." above with ${CMAKE_CURRENT_BINARY_DIR} + # Implement custom target to remove all examples output files + # created by ctest in a convenient way. Use special directory to + # store these files since otherwise an attempt to remove these + # files by name from a multi-use directory can exceed the maximum + # command-line length for the "MinGW Makefiles" cmd environment. add_custom_target(clean_ctest_plot_files - COMMAND ${CMAKE_COMMAND} -E remove ${test_output_files_LIST} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${CMAKE_COMMAND} -E remove_directory ${CTEST_EXAMPLES_OUTPUT_DIR} + COMMAND ${CMAKE_COMMAND} -E make_directory ${CTEST_EXAMPLES_OUTPUT_DIR} ) endif(BUILD_TEST) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |