Updated metrics and regrid tests

CDAT · Mar 3, 2015 · 678ff6a · 678ff6a
1 parent f64a4f7
commit 678ff6a
Show file tree

Hide file tree

Showing 3 changed files with 120 additions and 120 deletions.
diff --git a/testing/cdutil/CMakeLists.txt b/testing/cdutil/CMakeLists.txt
@@ -1,55 +1,55 @@
 
 # cdutil tests
 
-add_test("test_departures_time_bounds"
+cdat_add_test("test_departures_time_bounds"
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/cdutil/test_dep_bounds.py
     TestCDATLite)
 
 if(CDAT_DOWNLOAD_SAMPLE_DATA)
-  add_test("test_VariablesMatcher_1"
+  cdat_add_test("test_VariablesMatcher_1"
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/cdutil/test_VariablesMatcher_1.py)
-  add_test("test_VariablesMatcher_2"
+  cdat_add_test("test_VariablesMatcher_2"
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/cdutil/test_VariablesMatcher_2.py)
-  add_test("test_VariablesMatcher_3"
+  cdat_add_test("test_VariablesMatcher_3"
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/cdutil/test_VariablesMatcher_3.py)
-  add_test("test_averager"
+  cdat_add_test("test_averager"
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/cdutil/test_averager.py)
-  add_test("test_daily_bounds"
+  cdat_add_test("test_daily_bounds"
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/cdutil/test_daily_bounds.py)
-  add_test("test_gen_mask"
+  cdat_add_test("test_gen_mask"
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/cdutil/test_gen_mask.py)
-  add_test("test_keep_missing_value"
+  cdat_add_test("test_keep_missing_value"
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/cdutil/test_keep_missing_value.py)
-  add_test("test_missing_season"
+  cdat_add_test("test_missing_season"
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/cdutil/test_missing_season.py)
-  add_test("test_sftbyrgn"
+  cdat_add_test("test_sftbyrgn"
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/cdutil/test_sftbyrgn.py)
-  add_test("test_times"
+  cdat_add_test("test_times"
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/cdutil/test_times.py)
-  add_test("test_times_2"
+  cdat_add_test("test_times_2"
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/cdutil/test_times_2.py)
-  add_test("test_times_3"
+  cdat_add_test("test_times_3"
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/cdutil/test_times_3.py)
-  add_test("test_vert"
+  cdat_add_test("test_vert"
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/cdutil/test_vert.py)
-  add_test("test_years"
+  cdat_add_test("test_years"
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/cdutil/test_years.py)
-  add_test("test_djf_criteria"
+  cdat_add_test("test_djf_criteria"
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/cdutil/test_djf_criteria.py)
 endif()

diff --git a/testing/metrics/CMakeLists.txt b/testing/metrics/CMakeLists.txt
@@ -1,14 +1,14 @@
 # test from VCS, example of a graphics test
-#add_test(vcs_verify_hurricane_marker
+#cdat_add_test(vcs_verify_hurricane_marker
 #  "${PYTHON_EXECUTABLE}"
 #  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_hurricane_marker.py
 #  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_hurricane_marker.png
 #)
 # test from CDMS2, example of a test script
-#add_test("CDMS_Test_01"
+#cdat_add_test("CDMS_Test_01"
 #    "${PYTHON_EXECUTABLE}"
 #    ${cdat_SOURCE_DIR}/testing/cdms2/cdtest01.py)
-add_test("diags_test_01"
+cdat_add_test("diags_test_01"
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/metrics/diagtest01.py
   ${UVCMETRICS_TEST_DATA_DIRECTORY} )