Merge pull request #1500 from UV-CDAT/issue_1499_runtest_and_mpi_args_broken

Issue 1499 runtest and mpi args broken

Author: dnadeau4

CMake/cdat_modules_extra/matplotlib_setup_cfg.in

@@ -6,7 +6,7 @@
 [directories]
 # Uncomment to override the default basedir in setupext.py.
 # This can be a single directory or a space-delimited list of directories.
-basedirlist = @INSTALL_DIR@
+# basedirlist = @INSTALL_DIR@
 
 [status]
 # To suppress display of the dependencies and their versions

CMake/cdat_modules_extra/runpytest.in

@@ -6,7 +6,7 @@
 # a set of aliases for that trail (to replace filenames for example)
 # the filename of the image to compare against
 
-# set upuvcdat run time environment
+# setup uvcdat run time environment
 . @CMAKE_INSTALL_PREFIX@/bin/setup_runtime.sh
 
 # play back the requested vistrail and make an image

CMake/cdat_modules_extra/runtest.in

@@ -1,4 +1,4 @@
 #!/bin/bash
 # source is not portable whereas . is
 . "@CMAKE_INSTALL_PREFIX@/bin/setup_runtime.sh"
-python@PYVER@ "$@"
+$@

Packages/cdms2/setup.py

@@ -22,15 +22,19 @@
     import mpi4py
     ## Ok we have mpi4py let's build with support for it
     macros.append(("PARALLEL",None))
-    os.environ["CC"]="mpicc"
+    import subprocess
+    try:
+      mpicc = os.path.join(cdat_info.externals,"bin","mpicc")
+      subprocess.check_call([mpicc,"--version"])
+    except Exception,err:
+      mpicc="mpicc"
+      subprocess.check_call([mpicc,"--version"])
+    os.environ["CC"]=mpicc
     os.environ["CFLAGS"]="-w -g"
 except:
     os.environ["CFLAGS"]="-w -g"
     pass
-import cdat_info
-## if cdat_info.CDMS_INCLUDE_DAP=='yes':
-##     macros.append(("NONC4",None))
-print "MACROS PASSED:",macros
+
 setup (name = "cdms2",
        version='5.0',
        description = "Climate Data Management System, Numpy version",

testing/CMakeLists.txt

@@ -2,10 +2,10 @@
 #add_subdirectory(uvcdat)
 
 # Helper macro that sets the environment correctly
-macro (cdat_add_test name python_exe script)
+macro (cdat_add_test name)
   #string (REPLACE ";" " " TEST_ARGS "${ARGN}")
   add_test(${name} "${CMAKE_INSTALL_PREFIX}/bin/runtest"
-           ${script} ${ARGN})
+           ${ARGN})
   if(DEFINED ENV{UVCDAT_ANONYMOUS_LOG})
     set_tests_properties (${name}
       PROPERTIES ENVIRONMENT "UVCDAT_ANONYMOUS_LOG=$ENV{UVCDAT_ANONYMOUS_LOG}"

testing/matplotlib/CMakeLists.txt

@@ -1,11 +1,11 @@
 cdat_add_test(matplotlib_verify_import
-  "{PYTHON_EXECUTABLE}"
+  "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/matplotlib/test_matplotlib_import.py
 )
 
 if (CDAT_BUILD_BASEMAP)
   cdat_add_test(basemap_verify_import
-    "{PYTHON_EXECUTABLE}"
+    "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/matplotlib/test_basemap_import.py
   )
 endif()