From d400cbcf09039ce8f3262535892ef197adfe5e5f Mon Sep 17 00:00:00 2001 From: Bryan Herman Date: Fri, 4 Apr 2014 23:28:29 -0400 Subject: [PATCH] changed FC_DEFAULT to FC --- docs/source/devguide/workflow.rst | 2 +- tests/run_tests.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/source/devguide/workflow.rst b/docs/source/devguide/workflow.rst index 61ba7f23d..d5d2966fc 100644 --- a/docs/source/devguide/workflow.rst +++ b/docs/source/devguide/workflow.rst @@ -128,7 +128,7 @@ more control over which tests are executed. Before running the test suite python script, the following environmental variables should be set if the default paths are incorrect: - * **FC_DEFAULT** - The command of the default Fortran compiler. + * **FC** - The command of the Fortran compiler (e.g. gfotran, ifort). * Default - *gfortran* diff --git a/tests/run_tests.py b/tests/run_tests.py index fd3317a4d..b926b21de 100755 --- a/tests/run_tests.py +++ b/tests/run_tests.py @@ -27,16 +27,16 @@ parser.add_option('-p', '--print', action="store_true", (opts, args) = parser.parse_args() # Default compiler paths -FC_DEFAULT='gfortran' +FC='gfortran' MPI_DIR='/opt/mpich/3.0.4-gnu' HDF5_DIR='/opt/hdf5/1.8.12-gnu' PHDF5_DIR='/opt/phdf5/1.8.12-gnu' PETSC_DIR='/opt/petsc/3.4.3-gnu' # Override default compiler paths if environmental vars are found -if os.environ.has_key('FC_DEFAULT'): - FC_DEFAULT = os.environ['FC_DEFAULT'] - if FC_DEFAULT is not 'gfortran': +if os.environ.has_key('FC'): + FC = os.environ['FC'] + if FC is not 'gfortran': print('NOTE: Test suite only verifed for gfortran compiler.') if os.environ.has_key('MPI_DIR'): MPI_DIR = os.environ['MPI_DIR'] @@ -75,7 +75,7 @@ class Test(object): elif self.mpi and self.hdf5: self.fc = PHDF5_DIR+'/bin/h5pfc' else: - self.fc = FC_DEFAULT + self.fc = FC # Set rest of options if self.debug: