From 4837b1382f3f89e3b3762125db9a966d12b2a2aa Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Fri, 1 Dec 2017 14:01:07 -0700
Subject: [PATCH] Fixing for cmake parallel tests.

---
 examples/CDL/CMakeLists.txt |  4 ++--
 examples/CDL/do_comps.sh    | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/examples/CDL/CMakeLists.txt b/examples/CDL/CMakeLists.txt
index c19198c45..6d3c35f19 100644
--- a/examples/CDL/CMakeLists.txt
+++ b/examples/CDL/CMakeLists.txt
@@ -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)
diff --git a/examples/CDL/do_comps.sh b/examples/CDL/do_comps.sh
index faaa6fa4c..88f80f91f 100755
--- a/examples/CDL/do_comps.sh
+++ b/examples/CDL/do_comps.sh
@@ -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..."