Fixing for cmake parallel tests.

This commit is contained in:
Ward Fisher 2017-12-01 14:01:07 -07:00
parent 7e084c2aa6
commit 4837b1382f
2 changed files with 24 additions and 2 deletions

View File

@ -1,4 +1,4 @@
SET(CDL_EXAMPLE_TESTS create_sample_files do_comps)
SET(CDL_EXAMPLE_TESTS do_comps)
FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.sh ${CMAKE_CURRENT_SOURCE_DIR}/*.cdl)
FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR} FILE_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE)
@ -7,7 +7,7 @@ FOREACH(F ${CDL_EXAMPLE_TESTS})
add_sh_test(cdl ${F})
ENDFOREACH()
SET_TESTS_PROPERTIES(cdl_do_comps PROPERTIES DEPENDS cdl_create_sample_files)
SET_TESTS_PROPERTIES(cdl_do_comps PROPERTIES DEPENDS C_tests_simple_xy_wr)
SET_TESTS_PROPERTIES(cdl_do_comps PROPERTIES DEPENDS C_tests_sfc_pres_temp_wr)
SET_TESTS_PROPERTIES(cdl_do_comps PROPERTIES DEPENDS C_test_pres_temp_4D_wr)

View File

@ -3,6 +3,28 @@
# $Id: do_comps.sh,v 1.1 2006/06/27 17:44:54 ed Exp $
set -e
##
# This stanza was originally in create_sample_files.sh.
# Moved here.
##
echo ""
echo "*** Creating example data files from CDL scripts."
echo "*** creating simple_xy.nc..."
../../ncgen/ncgen -b -o simple_xy.nc $srcdir/simple_xy.cdl
echo "*** checking sfc_pres_temp.nc..."
../../ncgen/ncgen -b -o sfc_pres_temp.nc $srcdir/sfc_pres_temp.cdl
echo "*** checking pres_temp_4D.nc..."
../../ncgen/ncgen -b -o pres_temp_4D.nc $srcdir/pres_temp_4D.cdl
echo "*** All example creations worked!"
##
# End create_sample_files.
##
echo ""
echo "*** Testing that the CDL examples produced same files as C examples."
echo "*** checking simple_xy.nc..."