core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ECC-106 No need for trailing / in ECCODES_DEFINITION_PATH

This commit is contained in:
Florian Rathgeber 2017-02-03 14:13:35 +00:00
parent 353b6fa8f4
commit 2d59f77e0f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/definitions.sh
View File

@ -15,7 +15,7 @@ REDIRECT=/dev/null
[ -z "$ECCODES_DEFINITION_PATH" ] | ECCODES_DEFINITION_PATH=`${tools_dir}codes_info -d` [ -z "$ECCODES_DEFINITION_PATH" ] | ECCODES_DEFINITION_PATH=`${tools_dir}codes_info -d`
for file in `find $ECCODES_DEFINITION_PATH -name '*.def' -print` for file in `find ${ECCODES_DEFINITION_PATH}/ -name '*.def' -print`
do do
${tools_dir}codes_parser $file > $REDIRECT ${tools_dir}codes_parser $file > $REDIRECT
done done

3
tests/include.ctest.sh.in
View File

@ -11,8 +11,7 @@ proj_dir=@PROJECT_SOURCE_DIR@
data_dir=@PROJECT_BINARY_DIR@/data data_dir=@PROJECT_BINARY_DIR@/data
# use definitions from binary dir to test if installation will be correct # use definitions from binary dir to test if installation will be correct
# Note: 'definitions' is a symlink so must put final slash to interpret as directory def_dir="@CMAKE_BINARY_DIR@/@ECCODES_DEFINITION_SUFF@"
def_dir="@CMAKE_BINARY_DIR@/@ECCODES_DEFINITION_SUFF@/"
ECCODES_DEFINITION_PATH="${def_dir}" ECCODES_DEFINITION_PATH="${def_dir}"
export ECCODES_DEFINITION_PATH export ECCODES_DEFINITION_PATH