Testing: unset ECCODES_DEFINITION_PATH when MEMFS defined

This commit is contained in:
Shahram Najm 2020-01-16 14:40:06 +00:00
parent 016e1a4664
commit 969ed8934e
4 changed files with 19 additions and 1 deletions

View File

@ -4,6 +4,7 @@ set -eax
proj_dir=@PROJECT_SOURCE_DIR@
data_dir=@PROJECT_BINARY_DIR@/data
HAVE_MEMFS=@HAVE_MEMFS@
# use definitions from binary dir to test if installation will be correct
def_dir="@CMAKE_BINARY_DIR@/@ECCODES_DEFINITION_SUFF@"
@ -20,6 +21,10 @@ if test "x$ECCODES_TEST_WITH_VALGRIND" != "x"; then
examples_dir="valgrind --error-exitcode=1 -q $examples_dir"
fi
if [ $HAVE_MEMFS -eq 1 ]; then
unset ECCODES_DEFINITION_PATH
fi
# use samples from binary dir to test if installation will be correct
samp_dir="@CMAKE_BINARY_DIR@/@ECCODES_SAMPLES_SUFF@"
ECCODES_SAMPLES_PATH=${samp_dir}

View File

@ -4,6 +4,7 @@ set -eax
proj_dir=@PROJECT_SOURCE_DIR@
data_dir=@PROJECT_BINARY_DIR@/data
HAVE_MEMFS=@HAVE_MEMFS@
# use definitions from binary dir to test if installation will be correct
def_dir="@CMAKE_BINARY_DIR@/@ECCODES_DEFINITION_SUFF@"
@ -24,3 +25,7 @@ fi
samp_dir="@CMAKE_BINARY_DIR@/@ECCODES_SAMPLES_SUFF@"
ECCODES_SAMPLES_PATH=${samp_dir}
export ECCODES_SAMPLES_PATH
if [ $HAVE_MEMFS -eq 1 ]; then
unset ECCODES_DEFINITION_PATH
fi

View File

@ -3,6 +3,7 @@
set -eax
data_dir=@PROJECT_BINARY_DIR@/data
HAVE_MEMFS=@HAVE_MEMFS@
# use definitions from binary dir to test if installation will be correct
def_dir="@CMAKE_BINARY_DIR@/@ECCODES_DEFINITION_SUFF@"
@ -18,6 +19,10 @@ samp_dir="@CMAKE_BINARY_DIR@/@ECCODES_SAMPLES_SUFF@"
ECCODES_SAMPLES_PATH=${samp_dir}
export ECCODES_SAMPLES_PATH
if [ $HAVE_MEMFS -eq 1 ]; then
unset ECCODES_DEFINITION_PATH
fi
PYTHONPATH=@PROJECT_BINARY_DIR@/@ECCODES_PYTHON_DIR@:$PYTHONPATH
export PYTHONPATH

View File

@ -9,7 +9,10 @@
#
. ./include.sh
if [ $HAVE_MEMFS -eq 1 ]; then
echo "$0: This test is currently disabled with MEMFS"
exit 0
fi
#Define a common label for all the tmp files
label="metar_get_keys_test_p"